merge with dev

2017-12-10 14:44:54 +01:00
parent 1a105bef4c 4cc7861125
commit 5d67bb2e39
19 changed files with 1200 additions and 23 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -198,7 +198,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
    Gtk::ComboBoxText* custProfBuilderLabelType;

    Gtk::CheckButton* ckbHistogramPositionLeft;
-    Gtk::CheckButton* ckbHistogramWorking;
    Gtk::CheckButton* ckbFileBrowserToolbarSingleRow;
    Gtk::CheckButton* ckbShowFilmStripToolBar;
    Gtk::CheckButton* ckbShowdelimspot;