]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/arena_and_ca_fixes
authorterencehill <piuntn@gmail.com>
Wed, 11 Jan 2012 12:34:08 +0000 (13:34 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 11 Jan 2012 12:34:08 +0000 (13:34 +0100)
commitd41484d9c5e2aa6c3ebb81356c1c65a4c54a4a2a
tree9efb41b7efabf478e8de810e0f8a687fa42a319f
parent04e91e49c2cd7c88300508653e69ec24f4719419
parent6129d1aeada6d8c31ad16a0f6a90f7cf3d2fa0ea
Merge branch 'master' into terencehill/arena_and_ca_fixes
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/cmd.qc