]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/4team_ctf
authorMario <mario.mario@y7mail.com>
Tue, 6 Aug 2013 14:07:02 +0000 (00:07 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 6 Aug 2013 14:07:02 +0000 (00:07 +1000)
commit4401434b54faf0213bf04178eabcdf4e1bba970f
treec13d17958d9f81b3b96f468d36d6879ef593b021
parent8683f95feaa114556a160e928820d203fa44fecf
parente6bb286fd1beb18b27fd5c73da319977b4b7b78c
Merge branch 'master' into divVerent/4team_ctf
gamemodes.cfg