Enno Rehling 3a719226a2 Merge branch 'master' into develop ... Conflicts: src/buildno.h		2016-09-01 21:55:52 +02:00
..
armor
common
de
en
fr
resources
spellbooks
weapons
calendar.xml
messages.xml
prefixes.xml
ships.xml
spells.xml
spoils.xml