Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Thu, 19 May 2011 00:08:59 +0000 (20:08 -0400)
committerSamual <samual@xonotic.org>
Thu, 19 May 2011 00:08:59 +0000 (20:08 -0400)
commit7204ed4f20ffc2ac138f4adf278de52128529fe6
tree0179320c28da7d76119cc18c2eec775da54ec587
parentad2a02870d321031343f94bee328392c7156bafb
parentc96303a4cf08c3a73d9f111f81cb915bc06ae510
Merge remote branch 'origin/master' into samual/flyingspectators
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/miscfunctions.qc