Merge branch 'master' into Mario/race_cts_mutators
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 14:02:30 +0000 (01:02 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 14:02:30 +0000 (01:02 +1100)
commit31bf64ba7821ebb5c0aba8a154472810074ed11e
tree3daf00f5f0e8307fda244faed098da52ca7b6e61
parenta8e2728c110f6150cf51135722d57340d3be4c00
parentc412d3eef639e2d8b68682c51fd44bedb5d4308f
Merge branch 'master' into Mario/race_cts_mutators
qcsrc/server/anticheat.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/sv_main.qc