Commit Graph

5 Commits (bc5df7f35bf2f9e160a4739fbd96da584893cb55)

Author SHA1 Message Date
Sven Eberhardt 35a5df6c9b Revert accidental commit from master merge 2016-07-25 01:08:49 -04:00
Sven Eberhardt 534e4cc745 Merge branch 'master' into qteditor
Conflicts:
	src/script/C4AulParse.cpp
2016-07-24 10:23:57 -04:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Sven Eberhardt d4eb45f6b2 Set titles for a few scenarios in Tests.ocf.
So you can distinguish between them in the startup menu.
2014-10-03 21:58:33 +02:00
Sven Eberhardt 5101147b5f Test scenario: Local defs only 2013-03-19 19:29:50 +01:00