Enno Rehling 4f7b274bf6 Merge branch 'master' into develop ... Conflicts: res/core/messages.xml src/buildno.h		2016-01-01 16:38:57 +01:00
..
e2
e3
e4
astral.lua
autoseed.lua
cursed.lua
embassy.lua
ents.lua
eternath.lua
frost.lua
gates.lua
init.lua
jsreport.lua
locales.lua
markets.lua
path.lua
ponnuki.lua
resources.lua
rules.lua
spells.lua
tunnels.lua
wedding.lua
xmas.lua
xmasitems.lua
xmlconf.lua