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
..
catalog.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
config.json	read keywords from json configuration, use German imperative forms.	2014-10-29 19:40:09 +01:00
config.xml	Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4	2015-01-29 18:03:21 +01:00