Merge remote-tracking branch 'Lirusaito/master' into altcompilers

This commit is contained in:
Drake Arconis
2013-01-08 06:17:47 -05:00
6 changed files with 267 additions and 179 deletions

View File

@@ -6189,6 +6189,22 @@ This should be as low as possible, but too low may break functionality</string>
<integer>0</integer>
</array>
</map>
<key>FloaterDebugSettingsRect</key>
<map>
<key>Comment</key>
<string>Rectangle for the Debug Settings floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>0</integer>
<integer>300</integer>
<integer>245</integer>
<integer>0</integer>
</array>
</map>
<key>FloaterEnvRect</key>
<map>
<key>Comment</key>