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)
commitfbe0ecf4de0561cb63ad83f29702ac71d681dd76
treeff7d8ad988f6a1338f35b2af2764377f0a230756
parent7aad1a234787d8c6fcd042dad3ec7243e716c96c
parent396be1f0fd806ebca957a7a065d6934a8e85e0c9
Merge remote branch 'origin/master' into samual/flyingspectators
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc