Merge branch 'master' into Mario/physics
authorMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 01:31:11 +0000 (12:31 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 20 Jan 2015 01:31:11 +0000 (12:31 +1100)
commita8e3826e2ddd4fe24121bfa5954128b14b428058
treeedad61c766db5391584b9b6c1cdb01f1b2837f69
parent6db763e92ae2ee91df95cd1aefe90c2e20a7dddd
parent4c3cf7efc863be994bad18a855c771c0d1ded098
Merge branch 'master' into Mario/physics
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_physics.qc
qcsrc/server/g_world.qc