Merge remote-tracking branch 'origin/master' into samual/mutator_ctf
authorSamual Lenks <samual@xonotic.org>
Wed, 29 Aug 2012 05:14:44 +0000 (01:14 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 29 Aug 2012 05:14:44 +0000 (01:14 -0400)
commite332988cce112231a09d8c9c8c88d889a5fbea83
tree0dd717f8b817912d5ff38b91eab6dc97b0e47c02
parentd8e541e5cabb4e7981c0ab2e86f859440f0138f1
parent3b354d3d971a82b2f6fbcf4dd6b18e05711d0acf
Merge remote-tracking branch 'origin/master' into samual/mutator_ctf

Conflicts:
qcsrc/server/mutators/base.qh
qcsrc/server/progs.src
qcsrc/server/vehicles/vehicles.qc
vehicles.cfg
21 files changed:
defaultXonotic.cfg
qcsrc/client/autocvars.qh
qcsrc/client/waypointsprites.qc
qcsrc/common/items.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_triggers.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/t_teleporters.qc
qcsrc/server/teamplay.qc
qcsrc/server/tturrets/units/unit_ewheel.qc
qcsrc/server/tturrets/units/unit_walker.qc
qcsrc/server/vehicles/vehicles.qc
vehicles.cfg