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)
1  2 
defaultXonotic.cfg
qcsrc/server/autocvars.qh
qcsrc/server/cl_physics.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge