Merge remote-tracking branch 'origin/master' into zykure/teamscores
authorSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 22:23:54 +0000 (18:23 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 22:23:54 +0000 (18:23 -0400)
commit5a822ce9fdd1783ddfc0838bb147dd3963c5c2ca
tree5cb6f9cc159544a119a0affb61c70e6c49919568
parent6c871692f717a44bc7ba61d692153fff5b9430b6
parentd91b3e89615fe69b76d6e7f12327bf9efb03e1e6
Merge remote-tracking branch 'origin/master' into zykure/teamscores
qcsrc/server/cl_player.qc