]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Tue, 26 Apr 2011 03:31:39 +0000 (23:31 -0400)
committerSamual <samual@xonotic.org>
Tue, 26 Apr 2011 03:31:39 +0000 (23:31 -0400)
commit27089876c134e7ce9b93655efa313f380705db86
tree0834d5a41761a07626e762b7af95b7ad27ff0724
parentf70b616e0e724ebcb053d4d36918d4b6d1caf0b5
parent222d710d7104a365c69b184f6d1fb5738b9b95e3
Merge remote branch 'origin/master' into samual/mutator_ctf
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh