Enno Rehling 2aafb841a5 Merge branch 'master' into develop ... Conflicts: res/core/messages.xml scripts/eressea/e3/init.lua scripts/eressea/xmas.lua scripts/eressea/xmasitems.lua src/buildno.h src/laws.c		2015-12-26 14:46:20 +01:00
..
e2	Merge pull request #397 from stm2/taxing_message	2015-11-26 18:43:57 +01:00
e3	Merge branch 'master' into develop	2015-12-26 14:46:20 +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