Merge branch 'master' into terencehill/ca_arena_mutators
authorterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 21:20:41 +0000 (23:20 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 21:20:41 +0000 (23:20 +0200)
commit6c111e4d7176d56d83f0f1fc10280493c0439b9e
tree2ab191dc1d511bcf9061243c833d9b51e3e06b96
parentb58d514c07e4b22b86a93977653787902efba1d6
parent2eb667170068c570763b07108da07c05622a4f93
Merge branch 'master' into terencehill/ca_arena_mutators

Conflicts:
qcsrc/server/arena.qc
qcsrc/server/cl_client.qc
qcsrc/server/progs.src
16 files changed:
gamemodes.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/common/mapinfo.qc
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/mutators/base.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc
qcsrc/server/teamplay.qc