Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
server/scripts/tests/e3
History
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
..
castles.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
init.lua Merge branch 'master' into develop 2017-03-26 21:01:21 +02:00
items.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
morale.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
parser.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
production.lua Merge branch 'master' into develop 2017-03-26 21:01:21 +02:00
rules.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
spells-e2.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
spells.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00
stealth.lua remove attribs from rtype (it's only in rtype->construction that we use it?) 2017-03-17 22:46:10 +01:00