Merge branch 'samual/weapons' into Mario/weapons
authorMario <zacjardine@y7mail.com>
Thu, 6 Nov 2014 06:55:52 +0000 (17:55 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 6 Nov 2014 06:55:52 +0000 (17:55 +1100)
1  2 
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/miscfunctions.qc
qcsrc/server/t_items.qc
qcsrc/server/t_items.qh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge