Merge branch 'master' into gtk3

2015-11-05 23:36:23 +01:00
parent 4c4430be34 af0572629e
commit d26eaa174d
48 changed files with 581 additions and 384 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -599,7 +599,6 @@ void Options::setDefaults ()
        0, //ADDSET_WA_TMRS
        0, //ADDSET_WA_GAMMA
        0, //ADDSET_RETI_STR
-        0, //ADDSET_RETI_SCAL
        0, //ADDSET_RETI_NEIGH
        0, //ADDSET_RETI_LIMD
        0, //ADDSET_RETI_GAIN