Manual merge from Branch3

2011-03-20 11:38:27 +01:00
parent f9d74687b9
commit bfb5012eb4
9 changed files with 153 additions and 160 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -75,6 +75,8 @@ class Options {
    bool windowMaximized;
    int dirBrowserWidth;
    int dirBrowserHeight;
+	int preferencesWidth;
+	int preferencesHeight; 
    int lastScale;
    int lastCropSize;
    bool fbOnlyRaw;