merge with dev

2018-01-22 08:56:24 +01:00
parent 6cdbba2a0f 5342e75289
commit cef451807d
35 changed files with 1066 additions and 47 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -53,6 +53,7 @@ public:
    bool expcomp;
    bool hrenabled;
    bool method;
+    bool histmatching;
 };

 class RetinexParamsEdited