Merge branch 'dev' into newlocallab

2018-07-19 23:07:59 +02:00
parent e65c6786ff d73e5428f9
commit 0780aa0f8f
2038 changed files with 40844 additions and 190177 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -54,6 +54,7 @@ public:
    bool hrenabled;
    bool method;
    bool histmatching;
+    bool fromHistMatching;
    bool clampOOG;
 };