merge with dev

2018-04-11 13:08:28 +02:00
parent 450f6ecf09 ea94d74f9d
commit 62fc062712
86 changed files with 1758 additions and 3510 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -54,6 +54,7 @@ public:
    bool hrenabled;
    bool method;
    bool histmatching;
+    bool clampOOG;
 };

 class RetinexParamsEdited