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)
commit29885aa67f14a0fd7d7bc66b134eb7a2e5dfcba4
treef0f37468928a7b1b18194a739d04cbb3c52de12e
parent37367e3ae968839ba8a32668b1a2110c5418d4c6
parent35cf636a20e766a68fca2957de8891e7cf6745bb
Merge branch 'master' into Mario/weapons_new
qcsrc/server/cl_player.qc