Merge branch 'master' into Mario/physics
authorMario <zacjardine@y7mail.com>
Thu, 9 Jul 2015 07:19:29 +0000 (17:19 +1000)
committerMario <zacjardine@y7mail.com>
Thu, 9 Jul 2015 07:19:29 +0000 (17:19 +1000)
commit88713a575bd27dabc5926d636542b6145ab6f51c
treed98334b4d1f2d11e4f4d07e1cdbc87fcacf726f1
parentfe7b2b63c1ded887dec452264a5d150a372c0b75
parent44968fcb5b31c35a0e662906a8b9542ab3933561
Merge branch 'master' into Mario/physics

Conflicts:
qcsrc/server/autocvars.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