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/rtdata/options/options.osx
+++ b/rtdata/options/options.osx
@@ -66,8 +66,8 @@ SaveParamsToCache=true
 LoadParamsFromLocation=0

 [GUI]
-WindowWidth=1000
-WindowHeight=900
+WindowWidth=900
+WindowHeight=560
 WindowMaximized=false
 FileBrowserHeight=250
 ToolPanelWidth=300