Merge branch 'dev' into newlocallab

2019-11-04 23:01:33 +01:00
parent 91b80b23d2 ec5eaf9cea
commit 033d9fe02a
395 changed files with 2523 additions and 2740 deletions
--- a/rtgui/profilepanel.cc
+++ b/rtgui/profilepanel.cc
@@ -22,9 +22,12 @@
 #include "multilangmgr.h"
 #include "options.h"
 #include "profilestorecombobox.h"
+#include "paramsedited.h"
+#include "pathutils.h"
 #include "rtimage.h"

 #include "../rtengine/procparams.h"
+#include "../rtengine/procevents.h"

 using namespace rtengine;
 using namespace rtengine::procparams;