]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Wed, 6 Apr 2011 01:34:23 +0000 (21:34 -0400)
committerSamual <samual@xonotic.org>
Wed, 6 Apr 2011 01:34:23 +0000 (21:34 -0400)
commitf70b616e0e724ebcb053d4d36918d4b6d1caf0b5
treea290e7b2c57b406f77af364bbcac8147fb948f7b
parent5471c636794469b6c27dfa1c0a9d9db966525ff5
parent5f0f96b7da1ecaedd1be62dedfee5c4fe8a540e6
Merge remote branch 'origin/master' into samual/mutator_ctf
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh