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)
commitbc84852344a61cf02dea8f6db1a1e3a2449b4253
treefb837e5f42a1566b494403a87f8130367a32f910
parenta9b7572c2381856fa90ce31c68fb3cad71a9737c
parenta5b077eb799e456094034cdc0dd0d5b5a7e1119e
Merge branch 'samual/weapons' into Mario/weapons
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/miscfunctions.qc
qcsrc/server/t_items.qc
qcsrc/server/t_items.qh