Enno Rehling f2bb51b3ab Merge branch 'master' into develop ... Conflicts: res/adamantium.xml res/core/resources/laen.xml scripts/tests/common.lua scripts/tests/e2/adamantium.lua scripts/tests/e2/e2features.lua scripts/tests/e2/items.lua scripts/tests/items.lua src/bind_unit.c src/economy.test.c src/kernel/resources.c src/util/attrib.c		2017-03-26 21:01:21 +02:00
..
buildings	reduce complexity of building_protection.	2017-02-22 19:38:46 +01:00
core	Merge branch 'master' into develop	2017-03-26 21:01:21 +02:00
e3a	remove rtype->uget funpointer, and lua callbacks.	2017-03-04 20:59:43 +01:00
eressea	remote the item_type.use funpointer.	2017-02-27 20:41:05 +01:00
races	make item allow/deny XML easier to read, fix code	2017-03-03 09:56:27 +01:00
ships	reqsize defaults to 1.	2016-08-06 13:53:07 +02:00
adamantium.xml	Merge branch 'master' into develop	2017-03-26 21:01:21 +02: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
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
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