Nut.andor bd33ec7edd Merge remote-tracking branch 'Andors-Trail/test_fungi' into master ...

# Conflicts:
#	AndorsTrail/AndroidManifest.xml
#	AndorsTrail/assets/translation/cs.po
#	AndorsTrail/assets/translation/de.po
#	AndorsTrail/assets/translation/es.po
#	AndorsTrail/assets/translation/ja.po
#	AndorsTrail/assets/translation/ru.po
#	AndorsTrail/assets/translation/tr.po
#	AndorsTrail/assets/translation/zh_CN.po
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java

2021-01-24 23:18:45 +01:00

..

assets/translation

Merge remote-tracking branch 'Andors-Trail/test_fungi' into master

2021-01-24 23:18:45 +01:00

libs

Restored correct "libs/" directory

2015-04-13 17:43:30 +02:00

play

beta

2021-01-18 01:19:27 +01:00

res

Merge remote-tracking branch 'Andors-Trail/test_fungi' into master

2021-01-24 23:18:45 +01:00

src/com/gpl/rpg/AndorsTrail

Merge remote-tracking branch 'Andors-Trail/test_fungi' into master

2021-01-24 23:18:45 +01:00

.classpath

Key Area now use Requirement, instead of QuestProgress

2013-10-02 18:21:14 +02:00

.gitignore

git integration in Android Studio is ugly

2017-01-04 19:02:58 +02:00

.project

…

AndorsTrail.iml

+ new line

2017-01-04 18:26:18 +02:00

AndroidManifest.xml

fungi_panic

2021-01-24 22:44:06 +01:00

lint.xml

…

project.properties

v0.7.2 released.

2018-12-07 00:12:37 +01:00