Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:33:14 +0000 (01:33 -0400)
committerSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:33:14 +0000 (01:33 -0400)
commitb8f39159e32e43bb8fafb5d49a599cddc94a9011
tree94dff4305b16761f3295e663913305003a3a7bba
parent88f1fb1dc2a25d8e8ac2e622c70abeb5b7d42f2d
parent9c353fa60e05ae62e7092a5c0327c965e422ce3f
Merge remote branch 'origin/master' into samual/flyingspectators
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/warpzonelib/server.qc