Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Tue, 31 May 2011 00:35:02 +0000 (20:35 -0400)
committerSamual <samual@xonotic.org>
Tue, 31 May 2011 00:35:02 +0000 (20:35 -0400)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc

Simple merge
Simple merge
Simple merge