Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Wed, 20 Apr 2011 02:53:21 +0000 (22:53 -0400)
committerSamual <samual@xonotic.org>
Wed, 20 Apr 2011 02:53:21 +0000 (22:53 -0400)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc

Simple merge
Simple merge