Merge with trunk

2010-10-04 21:51:45 -07:00
parent 7853327bc7 a9fea09400
commit 7159b96087
20 changed files with 133 additions and 49 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -66,6 +66,7 @@ class Options {
    int saveAsDialogHeight;
    int toolPanelWidth;
    int browserToolPanelWidth;
+    int browserToolPanelHeight;
    int historyPanelWidth;
    int windowWidth;
    int windowHeight;