Zukero 3c6da6a1d7 Merge remote-tracking branch 'origin/master' ...

Conflicts:
	AndorsTrail/AndroidManifest.xml
	AndorsTrail/project.properties

2014-12-02 00:21:05 +01:00

..

arrays.xml

Convert all code spaces to tabs.

2013-07-23 16:36:26 +02:00

authors.xml

Refactor: Don't use hardcoded text for placeholders

2013-11-03 14:57:07 +01:00

loadresources_debug.xml

Added res/raw/actorconditions_debug.json, now loaded instead of the

2014-05-29 00:57:17 +02:00

loadresources.xml

Convert all code spaces to tabs.

2013-07-23 16:36:26 +02:00

strings_about.xml

Convert all code spaces to tabs.

2013-07-23 16:36:26 +02:00

strings.xml

Refactor: remove unused resources

2013-11-03 14:55:59 +01:00

styles.xml

Convert all code spaces to tabs.

2013-07-23 16:36:26 +02:00

ui_colors.xml

Refactor: remove unused resources

2013-11-03 14:55:59 +01:00

ui_dimen.xml

Convert all code spaces to tabs.

2013-07-23 16:36:26 +02:00

ui_ids.xml

Convert all code spaces to tabs.

2013-07-23 16:36:26 +02:00

ui_listviewstyle.xml

Convert all code spaces to tabs.

2013-07-23 16:36:26 +02:00

ui_styles.xml

Convert all code spaces to tabs.

2013-07-23 16:36:26 +02:00

worldmap_template.xml

Zoom out enabled on in-game world map.

2014-12-02 00:17:26 +01:00