Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9

(note: color.cc is still in the source tree and CMakeLists.txt)
2012-07-09 06:28:15 -04:00
parent 5a7efbbbbb
commit 6b842fd408
35 changed files with 270 additions and 185 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -140,6 +140,7 @@ class Options {
    bool useSystemTheme;
    static Glib::ustring cacheBaseDir;
    bool autoSuffix;
+    int saveMethodNum;
    bool saveParamsFile;
    bool saveParamsCache;
    PPLoadLocation paramsLoadLocation;