Merge

2010-10-03 19:52:27 +02:00
parent 23a8834755
commit 7c6de47f9d
39 changed files with 698 additions and 347 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;