merge with dev

2018-04-10 18:04:29 +02:00
parent e4d7b278ee 30d7deaee3
commit 431f516583
85 changed files with 785 additions and 2396 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -54,6 +54,7 @@ public:
    bool hrenabled;
    bool method;
    bool histmatching;
+    bool clampOOG;
 };

 class RetinexParamsEdited