Enno Rehling e6f3dc8b85 Merge branch 'master' into develop ... Conflicts: scripts/run-turn.lua src/buildno.h src/kernel/group.c src/kernel/save.c src/kernel/save.test.c src/kernel/version.h src/util/password.c src/util/password.test.c tests/run-turn.sh		2016-02-23 10:47:33 +01:00
..
data	fix integration test data file	2016-02-22 21:35:37 +01:00
eressea.ini	remove cruft from ini file	2015-05-21 13:23:07 +02:00
orders.184	fix integration test data file	2016-02-22 21:35:37 +01:00
run-turn.sh	Merge branch 'master' into develop	2016-02-23 10:47:33 +01:00
runtests.bat	TODO: find out which test left those files behind.	2015-12-05 18:47:11 +01:00
test-turn.lua	add missing file	2016-02-22 20:48:24 +01:00
write-reports.sh	fix write_faction_reference, check for f->alive in other places	2016-02-22 20:47:06 +01:00