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/rtengine/settings.h
+++ b/rtengine/settings.h
@@ -65,7 +65,6 @@ public:

    bool            gamutICC; // no longer used
    bool            gamutLch;
-    bool            ciecamfloat;
    bool            HistogramWorking;
    int             amchroma;
    int             protectred;