Merge branch 'master' into terencehill/quickmenu
authorterencehill <piuntn@gmail.com>
Wed, 25 Feb 2015 18:14:07 +0000 (19:14 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 25 Feb 2015 18:14:07 +0000 (19:14 +0100)
1  2 
qcsrc/client/hud.qc

Simple merge