Enno Rehling 4f7b274bf6 Merge branch 'master' into develop ... Conflicts: res/core/messages.xml src/buildno.h		2016-01-01 16:38:57 +01:00
..
buildings	fix a minor warning, get ready for 3.7 release	2015-11-16 14:12:51 +01:00
core	Merge branch 'master' into develop	2016-01-01 16:38:57 +01:00
e3a	no optioinal argument	2015-12-15 07:59:55 +01:00
eressea	Merge branch 'master' into develop	2015-12-26 14:46:20 +01:00
races	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
ships	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
adamantium.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
armor.xml	libxml 1.9.x seems to be a bit pickier about how XML catalogs are written.	2015-06-08 16:51:41 +02:00
buildings.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
herbs.xml	removed all unused items	2011-03-04 20:44:30 +01:00
items.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
luxuries.xml	removed all unused items	2011-03-04 20:44:30 +01:00
names-dragons.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
names-ghouls.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
names-skeletons.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
names-undead.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
names-zombies.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
races.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
ships.xml	Convert all XML files to UTF-8, to allow editing with Atom.	2015-05-11 16:55:11 -07:00
weapons.xml	libxml 1.9.x seems to be a bit pickier about how XML catalogs are written.	2015-06-08 16:51:41 +02:00