Enno Rehling d7a8a9b406 fix that catastrophic merge, make struct ally module-private		2018-10-26 21:49:58 +02:00
..
buildings
core	Bug 2489: Kill the SIEGE command, forever.	2018-09-09 21:01:10 +02:00
e3a	Merge branch 'develop'	2018-05-18 15:34:50 +02:00
eressea	Merge branch 'develop'	2018-05-18 15:34:50 +02:00
races
ships
translations	fix that catastrophic merge, make struct ally module-private	2018-10-26 21:49:58 +02:00
adamantium.xml
eressea.dtd