]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sat, 31 Dec 2011 16:09:11 +0000 (11:09 -0500)
committerSamual <samual@xonotic.org>
Sat, 31 Dec 2011 16:09:11 +0000 (11:09 -0500)
commitf703df4252a92f57506a161a13373d4298946f13
tree1098e6e6fdac8a118512847ddcc9fcee0358cb37
parentb40fec44bad9207fb7c4bb6aa7fd22dadf3e03cc
parent2878eb9811e6668def6681408dbc5e906d982a83
Merge remote branch 'origin/master' into samual/updatecommands
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc