Enno Rehling 3a719226a2 Merge branch 'master' into develop ... Conflicts: src/buildno.h		2016-09-01 21:55:52 +02:00
..
buildings
core
e3a
eressea
races
ships
adamantium.xml
armor.xml
buildings.xml
herbs.xml
items.xml
luxuries.xml
names-dragons.xml
names-ghouls.xml
names-skeletons.xml
names-undead.xml
names-zombies.xml
races.xml
ships.xml
weapons.xml