Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sun, 7 Nov 2010 01:50:55 +0000 (02:50 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 7 Nov 2010 01:50:55 +0000 (02:50 +0100)
commit28879369587fba51037e26ca14861bc7b5cc5629
tree86eea34016108d35bbc918e0fc9841265029ec89
parentd12a9a02953a615fe31330f9f3308411f416cc09
parentd2f8287ad70881aea79e61083c4659a402eb073e
Merge branch 'master' into terencehill/newpanelhud

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