Merge branch 'master' into terencehill/hud_configure
authorterencehill <piuntn@gmail.com>
Sun, 19 Apr 2015 10:35:13 +0000 (12:35 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 19 Apr 2015 10:35:13 +0000 (12:35 +0200)
1  2 
qcsrc/client/hud.qc
qcsrc/client/hud_config.qc

Simple merge
Simple merge