Enno Rehling 5f7b9129bc Merge branch 'master' into develop ... Conflicts: tests/runtests.bat		2015-09-12 22:47:33 +02:00
..
184.dat	create a more complex integration test for a unit that sails with a	2015-09-07 16:11:58 +02:00
inactive	remove prefixes.xml from E4, too	2015-09-12 13:38:31 +02:00
test.dat	remove global variable `verbosity` in favor of static in main.c (use log_* functions everywhere)	2015-09-12 20:58:09 +02:00