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)
commita3c1b020aadcb8cdd4a282b2604a45ad18ea1b4a
treeb51776117f541cc555a72938032646bac1181845
parentccf538838a3d4026636661723410c4ce4a1c6a0e
parentc0c597049ee837dd903a6c44436125788eb7ef3a
Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qh