Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sun, 31 Oct 2010 00:09:34 +0000 (02:09 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 31 Oct 2010 00:09:34 +0000 (02:09 +0200)
commit5b6650aacd624aa8a1153ee4322fb40a94eb3cb9
tree12e3b1e5c1e42adbd735f2e5f311c3bc722b012a
parent1a1485c3c79e2f8281ce3687867fdff43f907875
parent1aa23600d54e9d8e1802b853e43a352b5218055f
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/autocvars.qh
qcsrc/client/hud.qh
qcsrc/client/View.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/scoreboard.qc