]> 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, 11 Apr 2012 18:07:19 +0000 (14:07 -0400)
committerSamual <samual@xonotic.org>
Wed, 11 Apr 2012 18:07:19 +0000 (14:07 -0400)
commit2a779ce18b93a1f57057dcd7921d6c50cb5bea32
treea311c522bba0f45a0fe1eb3e95a8778a1002e7bd
parentf1226cb6e7b47c98ae0fd04f799816950ae15d61
parenta9a14af2cd6c6a7e8a946902cd91a3e345895ac5
Merge remote branch 'origin/master' into samual/mutator_ctf
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc