Merge remote-tracking branch 'origin/terencehill/misc_hud_fixes'
authorSamual Lenks <samual@xonotic.org>
Fri, 8 Mar 2013 22:08:18 +0000 (17:08 -0500)
committerSamual Lenks <samual@xonotic.org>
Fri, 8 Mar 2013 22:08:18 +0000 (17:08 -0500)
1  2 
_hud_descriptions.cfg
qcsrc/client/hud.qc

Simple merge
Simple merge