Merge branch 'master' into Mario/physics
authorMario <zacjardine@y7mail.com>
Sun, 7 Dec 2014 02:39:31 +0000 (13:39 +1100)
committerMario <zacjardine@y7mail.com>
Sun, 7 Dec 2014 02:39:31 +0000 (13:39 +1100)
commitbf5c2d4a98483e1f56f585ec7f22f1bff3c2e954
tree407f74d28ef43edd37037350a5d8ba9c9f31f5b1
parentf974062fbc8c2a2f086f036c2e8664517434b7e1
parent9b61cc050fa27b63946ae2dc72bb0d7960bd3808
Merge branch 'master' into Mario/physics

Conflicts:
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_physics.qc
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