Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
authorterencehill <piuntn@gmail.com>
Sat, 19 Jan 2013 14:24:12 +0000 (15:24 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 19 Jan 2013 14:24:12 +0000 (15:24 +0100)
1  2 
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/sv_main.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge