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
..
catalog.xml	libxml 1.9.x seems to be a bit pickier about how XML catalogs are written.	2015-06-08 16:51:41 +02:00
config.json	Merge branch 'release-3.7' into develop	2015-11-23 17:12:48 +01:00
config.xml	put the new(ish) email subject line in the CR,	2015-12-26 11:05:03 +01:00
terrains.json	fix desert.road in E3 also for 3.7.x	2015-12-20 20:16:13 +01:00