merge with dev

2018-01-06 08:01:11 +01:00
parent 7a714e5093 2d37fd6676
commit 3008d5d90d
48 changed files with 809 additions and 488 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -208,6 +208,9 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener

    DynamicProfilePanel *dynProfilePanel;

+    Gtk::ComboBoxText *cropGuides;
+    Gtk::CheckButton *cropAutoFit;
+
    Glib::ustring storedValueRaw;
    Glib::ustring storedValueImg;