Merge branch 'dev' into testoutputprofile

2018-07-22 03:25:49 +02:00
parent bbde907d72 3bfd903dc7
commit 3a6556404a
2033 changed files with 40818 additions and 190141 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -54,6 +54,7 @@ public:
    bool hrenabled;
    bool method;
    bool histmatching;
+    bool fromHistMatching;
    bool clampOOG;
 };