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
..
strings.xml	Merge branch 'master' into develop	2017-03-26 21:01:21 +02:00