merge wit dev

2019-11-07 07:17:19 +01:00
parent f72ec7bde2 a2d5ef356c
commit d621721ffe
417 changed files with 4353 additions and 5352 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -20,7 +20,19 @@

 #include <vector>

-#include "../rtengine/rtengine.h"
+namespace rtengine
+{
+
+namespace procparams
+{
+
+class ProcParams;
+
+class PartialProfile;
+
+}
+
+}

 struct GeneralParamsEdited {
    bool rank;