Merge branch 'master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Thu, 20 Jan 2011 18:50:47 +0000 (13:50 -0500)
committerSamual <samual@xonotic.org>
Thu, 20 Jan 2011 18:50:47 +0000 (13:50 -0500)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc

Simple merge
Simple merge