Merge remote-tracking branch 'origin/master' into samual/splashing
authorSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:12:10 +0000 (17:12 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:12:10 +0000 (17:12 -0500)
commit5792233348864c255d2a73e2d443d3c6b6b7205b
tree682ede20a173a3f832860e25681df58a8538e7f9
parente8a224d6a876a4582b9845f2946bafe1914fe76a
parent53e872ae4dc8dfbe10ed92aa30ec5329a491a4ff
Merge remote-tracking branch 'origin/master' into samual/splashing
qcsrc/client/movetypes.qc