]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 26 May 2013 15:29:26 +0000 (01:29 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 26 May 2013 15:29:26 +0000 (01:29 +1000)
commitf98617a36b6c2e4465c163e828e6e5967d00d951
tree3e675a447148ceff3e79aba427caf2410083692b
parent3d7a2e39328e162468d5bca5c1ec1eb4a2536ee6
parentf1ca9e449c3366f505d5d2898cddb8f504974138
Merge branch 'master' into Mario/monsters
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/gamemode_freezetag.qc
qcsrc/server/vehicles/vehicles.qc