Merge branch 'master' into Mario/physics
authorMario <zacjardine@y7mail.com>
Thu, 25 Dec 2014 10:22:26 +0000 (21:22 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 25 Dec 2014 10:22:26 +0000 (21:22 +1100)
commite8403b890ebeeb78eee50b449260a5b10aad2725
tree9bbc417c515623d08ae32f0b6c536dddd64745ca
parentbf5c2d4a98483e1f56f585ec7f22f1bff3c2e954
parent3e0fddda385e26f84951f699bd0292aef3e21188
Merge branch 'master' into Mario/physics
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