merge changes for storm-1515

meow-7.2.2
Oz Linden 2011-07-18 15:41:14 -04:00
commit 4dc0850da7
1 changed files with 3 additions and 3 deletions

View File

@ -4894,7 +4894,7 @@
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>20.0</real>
<real>60.0</real>
</map>
<key>MapOverlayIndex</key>
<map>
@ -12578,13 +12578,13 @@
<key>WatchdogEnabled</key>
<map>
<key>Comment</key>
<string>Controls whether the thread watchdog timer is activated.</string>
<string>Controls whether the thread watchdog timer is activated. Value is boolean. Set to -1 to defer to built-in default.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>20</integer>
<integer>1</integer>
</map>
<key>WaterGLFogDensityScale</key>
<map>