Merge branch 'master' into 'gtk3'

2016-03-05 09:21:34 +01:00
parent 830c58877f 72283f867d
commit a04c7706db
119 changed files with 3006 additions and 3007 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -646,7 +646,7 @@ public:
    bool enabled;
    bool gamutlab;
    bool mult[6];
-
+    bool cbdlMethod;
    bool threshold;
    bool skinprotect;
    bool hueskin;
@@ -712,6 +712,7 @@ public:
    XTransSensor xtranssensor;

    bool caCorrection;
+    bool caAutoStrength;
    bool caRed;
    bool caBlue;
    bool hotPixelFilter;