Merge branch 'dev' into hidpi-icons

2019-03-13 01:00:14 +01:00
parent 4c904967b2 86690f1ca0
commit 52dcd08b97
165 changed files with 2388 additions and 1653 deletions
--- a/rtengine/init.cc
+++ b/rtengine/init.cc
@@ -32,6 +32,7 @@
 #include "profilestore.h"
 #include "../rtgui/threadutils.h"
 #include "rtlensfun.h"
+#include "procparams.h"

 namespace rtengine
 {