Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 1 Jan 2012 20:11:16 +0000 (15:11 -0500)
committerSamual <samual@xonotic.org>
Sun, 1 Jan 2012 20:11:16 +0000 (15:11 -0500)
commit03909954b4ee287a38a122291fb8a6166b834a72
tree53ad64ea574bfc48722521086bbaa5c6a33d4097
parentf703df4252a92f57506a161a13373d4298946f13
parent4957f6abbba060a61426e781272ad1e3f08cc4ff
Merge remote branch 'origin/master' into samual/updatecommands
qcsrc/server/cl_player.qc