Merge branch 'master' into retinex

2015-09-16 21:03:39 +02:00
parent 8291e8375c 3935c6b2aa
commit ea737ca866
21 changed files with 123 additions and 149 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -99,7 +99,8 @@ public:
    Glib::ustring defProfRaw;
    Glib::ustring defProfImg;
    Glib::ustring dateFormat;
-    int adjusterDelay;
+    int adjusterMinDelay;
+    int adjusterMaxDelay;
    int  startupDir;
    Gtk::SortType dirBrowserSortType;
    Glib::ustring startupPath;