Enno Rehling 3a719226a2 Merge branch 'master' into develop ... Conflicts: src/buildno.h		2016-09-01 21:55:52 +02:00
..
armor	reqsize defaults to 1.	2016-08-06 13:53:07 +02:00
common	reqsize defaults to 1.	2016-08-06 13:53:07 +02:00
de	Merge branch 'master' into develop	2016-09-01 21:55:52 +02: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	reqsize defaults to 1.	2016-08-06 13:53:07 +02:00
spellbooks	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
weapons	reqsize defaults to 1.	2016-08-06 13:53:07 +02:00
calendar.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
messages.xml	remove dead phoenix feature.	2016-08-29 20:56:00 +01:00
prefixes.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
ships.xml	reqsize defaults to 1.	2016-08-06 13:53:07 +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