Merge branch 'dev' into newlocallab

2018-09-15 20:53:21 +02:00
parent 47f0564d25 e99bcff8bb
commit e9d4dede48
178 changed files with 4228 additions and 3683 deletions
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -904,6 +904,8 @@ public:
    XTransSensor xtranssensor;

    bool ca_autocorrect;
+    bool ca_avoidcolourshift;
+    bool caautoiterations;
    bool cared;
    bool cablue;
    bool hotPixelFilter;