Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Mon, 15 Aug 2011 05:23:18 +0000 (01:23 -0400)
committerSamual <samual@xonotic.org>
Mon, 15 Aug 2011 05:23:18 +0000 (01:23 -0400)
commit7ec398db61b56e3c74bf0dbef1f6740a81cc7ced
tree23702530a852580a14a3551309edf2169bb5f16c
parentb04aec646adba2536f1b01e16f18b732c7882852
parent5eefde1548c4dfd4e8fa20145b9285cdfb970b2a
Merge remote branch 'origin/master' into samual/mutator_ctf

Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
14 files changed:
qcsrc/server/arena.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/role_ctf.qc
qcsrc/server/cheats.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/nexball.qc
qcsrc/server/portals.qc
qcsrc/server/progs.src
qcsrc/server/teamplay.qc
qcsrc/server/vehicles/vehicles.qc