Merge remote-tracking branch 'origin/master' into Mario/assault_mutator
authorSamual Lenks <samual@xonotic.org>
Tue, 7 May 2013 05:42:27 +0000 (01:42 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 7 May 2013 05:42:27 +0000 (01:42 -0400)
commit4779c1bd8269aaca0d20e802c7e8e685602bb926
treed9b8658e9011f42b41ba799e16dd90b272458327
parent39c12453fec6998ed3e660ac5279845d07fb525c
parent7094e1bf39336183150e9da00f9d3e2d7d0b664b
Merge remote-tracking branch 'origin/master' into Mario/assault_mutator

Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/attic/assault.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/cl_client.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/scores_rules.qc
qcsrc/server/teamplay.qc
qcsrc/server/vehicles/vehicles.qc