Merge branch 'master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Thu, 20 Jan 2011 18:50:47 +0000 (13:50 -0500)
committerSamual <samual@xonotic.org>
Thu, 20 Jan 2011 18:50:47 +0000 (13:50 -0500)
commit7aad1a234787d8c6fcd042dad3ec7243e716c96c
tree230c942ee501e6c896abcc8bf23866ee7791a4e7
parent3d64cafffeacc929dddf6322d89acc12db5009d8
parent0929efe357b2b27c1c8fdee16d4b349c58d3034f
Merge branch 'master' into samual/flyingspectators
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc