Merge branch 'master' into Mario/physics
authorMario <zacjardine@y7mail.com>
Thu, 5 Feb 2015 04:38:18 +0000 (15:38 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 5 Feb 2015 04:38:18 +0000 (15:38 +1100)
commit128cea32714586feb51b4a0d78a6bd4e35fef9f2
treef7954ff31379d32debb516e9546d9724c70fcdf9
parenta8e3826e2ddd4fe24121bfa5954128b14b428058
parentc36125569f424bea49b14873f7235e220b5806ef
Merge branch 'master' into Mario/physics

Conflicts:
qcsrc/server/autocvars.qh
qcsrc/server/cl_physics.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_buffs.qh
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_physics.qc
qcsrc/server/command/cmd.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/mutators/mutator_buffs.qh