Enno Rehling c3ed521d4f Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4 ... Conflicts: src/laws.c		2015-01-29 18:03:21 +01:00
..
e2	Grenze für E2	2014-12-18 11:57:30 +01: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	I have no idea why this worked, since my eressea/git is a symlink,	2015-01-09 21:53:06 +01:00
keywords.json	BREED/PLANT/GROW are technically the same command, merge them.	2015-01-04 15:11:49 +01:00