Merge branch 'master' into Mario/weapons_new
authorMario <zacjardine@y7mail.com>
Wed, 26 Nov 2014 21:55:02 +0000 (08:55 +1100)
committerMario <zacjardine@y7mail.com>
Wed, 26 Nov 2014 21:55:02 +0000 (08:55 +1100)
1  2 
qcsrc/server/cl_player.qc

Simple merge