Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Tue, 26 Oct 2010 22:12:06 +0000 (00:12 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 26 Oct 2010 22:12:06 +0000 (00:12 +0200)
1  2 
qcsrc/client/hud.qc

Simple merge