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)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/sv_main.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge