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
..
strings.xml	Merge branch 'master' into develop	2015-12-26 14:46:20 +01:00