Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Wed, 14 Jul 2010 20:33:14 +0000 (22:33 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 14 Jul 2010 20:33:14 +0000 (22:33 +0200)
Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qh


Trivial merge