merge with dev

2018-04-10 18:04:29 +02:00
parent e4d7b278ee 30d7deaee3
commit 431f516583
85 changed files with 785 additions and 2396 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -114,7 +114,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
    Gtk::CheckButton* monBPC;
    Gtk::CheckButton* cbAutoMonProfile;
    //Gtk::CheckButton* cbAutocielab;
-    Gtk::CheckButton* cbciecamfloat;
    Gtk::CheckButton* cbdaubech;
    Gtk::SpinButton*  hlThresh;
    Gtk::SpinButton*  shThresh;