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/rtgui/guiutils.cc
+++ b/rtgui/guiutils.cc
@@ -22,6 +22,7 @@
 #include "options.h"
 #include "../rtengine/rt_math.h"
 #include "../rtengine/utils.h"
+#include "../rtengine/procparams.h"
 #include "rtimage.h"
 #include "multilangmgr.h"