Enno Rehling 5b9333f6d9 Merge branch 'release-3.7' into develop ... Conflicts: src/buildno.h src/monsters.c		2015-11-23 17:12:48 +01:00
..
e2	fix https://bugs.eressea.de/view.php?id=2164 (ships get no damage when they drift).	2015-11-23 12:37:42 +01:00
e3	Merge branch 'release-3.7' into develop	2015-11-23 17:12:48 +01:00
e4	Merge branch 'release-3.7' into develop	2015-11-23 17:12:48 +01:00
eressea.ini	diable test_peasantluck, it fails on master	2015-05-24 10:31:11 +02:00
keywords.json	BREED/PLANT/GROW are technically the same command, merge them.	2015-01-04 15:11:49 +01:00
prefixes.json	Präfix Erz	2015-09-12 14:13:45 +02:00