commit after merge with trunk

2010-09-09 20:26:00 -07:00
parent 84ecfe412a
commit aa77b69443
18 changed files with 394 additions and 301 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -95,6 +95,7 @@ class Options {
    Glib::ustring language;
    Glib::ustring theme;
    static Glib::ustring cacheBaseDir;
+    bool autoSuffix;
    bool saveParamsFile;
    bool saveParamsCache;
    PPLoadLocation paramsLoadLocation;