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
..
spellbooks	Bug 2115: fix cerrdor -> cerddor spelling errors.	2015-07-07 20:30:34 +02:00
artrewards.xml	undo CRLF crazy	2010-08-08 09:40:42 +02:00
buildings.xml	undo CRLF crazy	2010-08-08 09:40:42 +02:00
equipment.xml	some specialized equipment	2014-06-03 07:35:45 -07:00
familiars.xml	familiars with differnt skills for different games	2014-05-10 13:50:16 -07:00
items.xml	putting all of the pieces together for the snow globe, with final use implementation still TBD	2015-12-22 18:46:42 +01:00
races.xml	Merge pull request #432 from ennorehling/braineaters	2015-12-10 22:12:38 +01:00
spellinfo.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
spells.xml	issue #428, fix writing spell description for break_curse	2015-12-06 16:45:31 +01:00
strings.xml	suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels	2015-12-18 15:13:15 +01:00