Merge from default branch

This commit is contained in:
ffsup2
2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions

View File

@@ -69,6 +69,7 @@ class Options {
int historyPanelWidth;
int windowWidth;
int windowHeight;
bool windowMaximized;
int dirBrowserWidth;
int dirBrowserHeight;
int lastScale;
@@ -95,6 +96,7 @@ class Options {
Glib::ustring language;
Glib::ustring theme;
static Glib::ustring cacheBaseDir;
bool autoSuffix;
bool saveParamsFile;
bool saveParamsCache;
PPLoadLocation paramsLoadLocation;