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)
1  2 
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge
Simple merge