Merge remote branch 'origin/terencehill/arena_and_ca_fixes'
authorSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:16:36 +0000 (20:16 -0500)
committerSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:16:36 +0000 (20:16 -0500)
commit87d4a81433ca7dbd761782f9b4b235976c7cdae5
tree0337d493f418af7054729fcfbfe0f9a167f0dd4d
parente52c92b8ba22924be19d8458fb1dd0cb7cfe11c7
parent1e41400447e09dc6d3876bc622658ab66e2b1fbd
Merge remote branch 'origin/terencehill/arena_and_ca_fixes'
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/sv_main.qc