Skip to content
Snippets Groups Projects
Commit f07173a9 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1452

parents b278b61f 77bffdce
No related branches found
No related tags found
No related merge requests found
...@@ -452,6 +452,7 @@ Jonathan Yap ...@@ -452,6 +452,7 @@ Jonathan Yap
STORM-899 STORM-899
STORM-1273 STORM-1273
STORM-457 STORM-457
STORM-1452
STORM-1406 STORM-1406
STORM-1327 STORM-1327
STORM-1396 STORM-1396
...@@ -791,6 +792,7 @@ Strife Onizuka ...@@ -791,6 +792,7 @@ Strife Onizuka
SNOW-691 SNOW-691
TankMaster Finesmith TankMaster Finesmith
STORM-1100 STORM-1100
STORM-1452
Tayra Dagostino Tayra Dagostino
SNOW-517 SNOW-517
SNOW-543 SNOW-543
......
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="DEBUG INDSTILLINGER"> <floater name="settings_debug" title="DEBUG INDSTILLINGER">
<radio_group name="boolean_combo"> <radio_group name="boolean_combo">
<radio_item label="SANDT" name="TRUE" value="sand"/> <radio_item label="SANDT" name="TRUE" />
<radio_item label="FALSK" name="FALSE" value=""/> <radio_item label="FALSK" name="FALSE" />
</radio_group> </radio_group>
<color_swatch label="Farve" name="val_color_swatch"/> <color_swatch label="Farve" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/> <spinner label="x" name="val_spinner_1"/>
......
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="CONFIGURACIONES DEL DEPURADOR"> <floater name="settings_debug" title="CONFIGURACIONES DEL DEPURADOR">
<radio_group name="boolean_combo"> <radio_group name="boolean_combo">
<radio_item label="VERDADERO" name="TRUE" value="verdadero"/> <radio_item label="VERDADERO" name="TRUE" />
<radio_item label="FALSO" name="FALSE" value=""/> <radio_item label="FALSO" name="FALSE" />
</radio_group> </radio_group>
<color_swatch label="Color" name="val_color_swatch"/> <color_swatch label="Color" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/> <spinner label="x" name="val_spinner_1"/>
......
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="PARAMETRI DI DEBUG"> <floater name="settings_debug" title="PARAMETRI DI DEBUG">
<radio_group name="boolean_combo"> <radio_group name="boolean_combo">
<radio_item label="VERO" name="TRUE" value="vero"/> <radio_item label="VERO" name="TRUE" />
<radio_item label="FALSO" name="FALSE" value=""/> <radio_item label="FALSO" name="FALSE" />
</radio_group> </radio_group>
<color_swatch label="Colore" name="val_color_swatch"/> <color_swatch label="Colore" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/> <spinner label="x" name="val_spinner_1"/>
......
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="USTAWIENIA DEBUGOWANIA"> <floater name="settings_debug" title="USTAWIENIA DEBUGOWANIA">
<radio_group name="boolean_combo"> <radio_group name="boolean_combo">
<radio_item label="PRAWDA" name="TRUE" value="prawda"/> <radio_item label="PRAWDA" name="TRUE" />
<radio_item label="NIEPRAWDA" name="FALSE" value=""/> <radio_item label="NIEPRAWDA" name="FALSE" />
</radio_group> </radio_group>
<color_swatch label="Kolor" name="val_color_swatch"/> <color_swatch label="Kolor" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/> <spinner label="x" name="val_spinner_1"/>
......
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="DEBUG SETTINGS"> <floater name="settings_debug" title="DEBUG SETTINGS">
<radio_group name="boolean_combo"> <radio_group name="boolean_combo">
<radio_item label="TRUE" name="TRUE" value="verdadeiro"/> <radio_item label="TRUE" name="TRUE" />
<radio_item label="FALSE" name="FALSE" value=""/> <radio_item label="FALSE" name="FALSE" />
</radio_group> </radio_group>
<color_swatch label="Cor" name="val_color_swatch"/> <color_swatch label="Cor" name="val_color_swatch"/>
<spinner label="x" name="val_spinner_1"/> <spinner label="x" name="val_spinner_1"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment