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)
commit0f6085c8ea46125d87ca81ec7f5e82f73c08f958
tree71e32125374da47f6015260998243cc76aa0b8f4
parent1095fa06ccb2d38b4387a9b07d12b299a3351e32
parentea7689ec6a11518746bdb2fb07a13e9e5d3d716d
Merge branch 'master' into terencehill/ca_arena_freezetag_bugfixes
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