Merge branch 'master' into gtk3

2016-10-16 23:26:51 +02:00
parent a6fc7cd37d 50165dab20
commit 4efae5c764
53 changed files with 4404 additions and 857 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -97,6 +97,7 @@ protected:
    Gtk::FileChooserButton* iccDir;
    Gtk::ComboBoxText* monProfile;
    Gtk::ComboBoxText* monIntent;
+    Gtk::CheckButton* monBPC;
    Gtk::CheckButton* cbAutoMonProfile;
    //Gtk::CheckButton* cbAutocielab;
    Gtk::CheckButton* cbciecamfloat;