server/se
Enno Rehling 397a157fdc Merge branch 'develop' into feature/bug-1588-magicpower-limit
Conflicts:
	scripts/tests/e2/init.lua
	src/battle.c
	src/bind_unit.c
	src/kernel/spellid.h
	src/magic.c
	src/magic.h
2015-08-06 19:16:05 +02:00
..
Eressea.vpw
eressea.vpj Merge branch 'develop' into feature/bug-1588-magicpower-limit 2015-08-06 19:16:05 +02:00
server.vpj
tests.vpj fix a fall-through in jsonconf causing an error message. 2014-07-05 18:21:20 -07:00