Merge branch 'master' of git://github.com/siana/SingularityViewer.git

This commit is contained in:
Shyotl
2011-04-16 18:24:34 -05:00
7 changed files with 112 additions and 98 deletions

View File

@@ -85,7 +85,7 @@
<spinner bottom="-229" decimal_digits="0" enabled="true"
follows="left|top" height="16" increment="1" initial_val="300"
label="Away Timeout:" label_width="141" left="10" max_val="600"
min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
min_val="0" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
<check_box bottom="-265" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Notify when in-world currency is spent or received" left="151"