Merge branch 'master' into terencehill/ca_arena_mutators
authorterencehill <piuntn@gmail.com>
Wed, 27 Feb 2013 18:03:45 +0000 (19:03 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 27 Feb 2013 18:03:45 +0000 (19:03 +0100)
commit6c3104a65005223002dfb708d4dec7481722c355
tree63930730d52657ffc67aca454c97f2b27afd1d71
parent37fbc0b655512722904bda47216d4323a0db514b
parentd27a9970837d9430120bc4dbe0fa873ecce87450
Merge branch 'master' into terencehill/ca_arena_mutators
qcsrc/client/announcer.qc
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/w_minstanex.qc