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)
commit3ec964f96486cbe7f8e39a2d1badcc361370fafb
tree904ba193f2b8acde7661a35e5c5db61b2f9f236c
parent7204ed4f20ffc2ac138f4adf278de52128529fe6
parentccb58bb7bd62f64a64ed18232d7b0ab475816939
Merge remote branch 'origin/master' into samual/flyingspectators
defaultXonotic.cfg
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc