Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Wed, 8 Feb 2012 22:33:07 +0000 (17:33 -0500)
committerSamual <samual@xonotic.org>
Wed, 8 Feb 2012 22:33:07 +0000 (17:33 -0500)
commitd9708336de4c01e81ea08bb205093b676b7cb882
tree85aa4693fd7dccd713bf4584f2a8a17cc2408288
parent7ec398db61b56e3c74bf0dbef1f6740a81cc7ced
parent40e83082fa1797a0f55de18cda4f737af2121c19
Merge remote branch 'origin/master' into samual/mutator_ctf

Conflicts:
qcsrc/common/items.qh
qcsrc/server/bot/havocbot/role_ctf.qc
qcsrc/server/cl_client.qc
qcsrc/server/teamplay.qc
16 files changed:
qcsrc/common/items.qh
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/mutators/mutators.qh
qcsrc/server/nexball.qc
qcsrc/server/portals.qc
qcsrc/server/progs.src
qcsrc/server/teamplay.qc
qcsrc/server/vehicles/vehicles.qc