Enno Rehling 4f7b274bf6 Merge branch 'master' into develop ... Conflicts: res/core/messages.xml src/buildno.h		2016-01-01 16:38:57 +01:00
..
armor	…
common	re-enable silver weight	2015-03-07 13:56:31 +01:00
de	Merge branch 'master' into develop	2016-01-01 16:38:57 +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	…
messages.xml	Merge branch 'master' into develop	2016-01-01 16:38:57 +01:00
prefixes.xml	…
ships.xml	…
spells.xml	…
spoils.xml	…