Merge branch 'master' into gtk3

2016-01-11 00:54:25 +01:00
parent a4d49ee5f2 5ff270bf51
commit a54dd81b1a
69 changed files with 1940 additions and 1001 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -326,7 +326,7 @@ void Options::setDefaults ()
    defProfRaw = DEFPROFILE_RAW;
    defProfImg = DEFPROFILE_IMG;
    dateFormat = "%y-%m-%d";
-    adjusterMinDelay = 200;
+    adjusterMinDelay = 100;
    adjusterMaxDelay = 200;
    startupDir = STARTUPDIR_LAST;
    startupPath = "";