Merge branch 'master' into sev/hud_kh
authorMario <zacjardine@y7mail.com>
Thu, 22 Jan 2015 08:12:07 +0000 (19:12 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 22 Jan 2015 08:12:07 +0000 (19:12 +1100)
1  2 
qcsrc/client/hud.qc

Simple merge