]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Thu, 31 Mar 2011 18:52:28 +0000 (14:52 -0400)
committerSamual <samual@xonotic.org>
Thu, 31 Mar 2011 18:52:28 +0000 (14:52 -0400)
commit69e0731387634bd57e7538f4aa35c04c9d561bd1
treea5e3cd80acb0ada1ee3b90629d11041c486c3990
parentab75bf795f011a3bccb71d1810d9e51361e832d3
parent57c2420916f58ef57b78062b070c3645b1872695
Merge remote branch 'origin/master' into samual/mutator_ctf
qcsrc/server/autocvars.qh
qcsrc/server/cl_player.qc