Enno Rehling 6e9f889e77 Merge branch 'master' of github.com:eressea/server ... Conflicts: src/laws.test.c		2015-06-08 08:47:36 +02:00
..
e2	rules.give.max_men == -1 für unlimitierte Übergaben in E2	2015-04-28 17:40:41 +02:00
e3	read keywords from json configuration, use German imperative forms.	2014-10-29 19:40:09 +01:00
e4	Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4	2015-01-29 18:03:21 +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