Merge remote-tracking branch 'origin/master' into divVerent/lavafix
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:54:26 +0000 (20:54 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:54:26 +0000 (20:54 -0400)
1  2 
qcsrc/server/cl_physics.qc

Simple merge