Zukero 45d3ab9fb5 Merge branch 'master' into stoutford_tests ...

Conflicts:
	AndorsTrail/res/values/loadresources.xml

2017-07-25 21:33:55 +02:00

..

anim

Convert all code spaces to tabs.

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

drawable

Merge branch 'master' into stoutford_tests

2017-07-25 21:33:55 +02:00

drawable-hdpi

Virtual D-pad (thanks to Samuel)

2011-07-08 12:31:21 +00:00

drawable-ldpi

Virtual D-pad (thanks to Samuel)

2011-07-08 12:31:21 +00:00

drawable-mdpi

Update app icon for mdpi densities (reduce blur).

2012-10-13 23:08:38 +02:00

drawable-xhdpi

Add xhdpi and xxhdpi icons. Update to SDK 19.

2013-11-10 12:09:36 +01:00

drawable-xxhdpi

Add xhdpi and xxhdpi icons. Update to SDK 19.

2013-11-10 12:09:36 +01:00

layout

Merge pull request #22 from HummusSamurai/feature/SortingAndCategories

2017-02-22 14:13:24 +01:00

layout-land

extra newlines

2017-01-13 16:51:39 +02:00

menu

Skills, Inventory, and Shops now have the Sort & Category options in the UI.

2017-01-04 01:29:46 +02:00

raw

Merge branch 'master' into stoutford_tests

2017-07-25 21:33:55 +02:00

values

Merge branch 'master' into stoutford_tests

2017-07-25 21:33:55 +02:00

values-de

Merged weblate changes with conflicting manual adaptations of

2015-11-16 11:20:33 +01:00

values-es

Small fix for unescaped apostrophe in Spanish text

2016-01-06 22:34:25 +01:00

values-fr

Merged weblate changes with conflicting manual adaptations of

2015-11-16 11:20:33 +01:00

values-it

Continued %-symbol deletion.

2015-10-29 16:04:10 +01:00

values-iw

Updated all "strings.xml" translations to remove obsolete lines.

2014-04-23 00:33:39 +02:00

values-ja

Translated using Weblate (Japanese)

2015-11-12 06:44:46 +01:00

values-pl

Merged weblate changes with conflicting manual adaptations of

2015-11-16 11:20:33 +01:00

values-pt

Continued %-symbol deletion.

2015-10-29 16:04:10 +01:00

values-pt-rBR

Moved string resource "about_interface" from strings_about.xml to

2015-11-13 15:08:26 +01:00

values-ru

Continued %-symbol deletion.

2015-10-29 16:04:10 +01:00

values-v10

Convert all code spaces to tabs.

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

xml

Merge branch 'master' into stoutford_tests

2017-07-25 21:33:55 +02:00