Enno Rehling a08ad52809 Merge branch 'develop' ... Conflicts: src/util/log.c		2016-08-31 18:15:07 +02:00
..
e2	Merge branch 'develop'	2016-08-31 18:15:07 +02:00
e3	fix a FIXME: setting default order through config, making test better.	2016-04-09 19:05:28 +02:00
e4	fix a FIXME: setting default order through config, making test better.	2016-04-09 19:05:28 +02: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