Enno Rehling 4b7cb824bd Merge branch 'massive_overload' of https://github.com/stm2/server into stm2-massive_overload ... Conflicts: src/move.c src/tests.c		2015-11-27 12:40:17 +01:00
..
armor	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
common	re-enable silver weight	2015-03-07 13:56:31 +01:00
de	Moved the description of skillpotion to another namespace	2015-11-16 03:22:19 +01:00
en	Bug 1805: re-enable NMR warnings	2015-07-03 15:31:57 +02:00
fr	Bug 1805: re-enable NMR warnings	2015-07-03 15:31:57 +02:00
resources	Bug 1949: Zauberbeutelverhalten (magic bag tests & config changes)	2015-07-01 22:13:24 +02:00
spellbooks	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
weapons	fixing bug 2141	2015-09-25 11:31:43 +02:00
calendar.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
messages.xml	Merge branch 'massive_overload' of https://github.com/stm2/server into stm2-massive_overload	2015-11-27 12:40:17 +01:00
prefixes.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
ships.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
spells.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
spoils.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00