Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:26:03 +0000 (08:26 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 14 Apr 2015 22:26:03 +0000 (08:26 +1000)
1  2 
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc

Simple merge
Simple merge