Merge branch 'master' into terencehill/hud_code_restructure
authorterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 22:16:26 +0000 (00:16 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 22:16:26 +0000 (00:16 +0200)
1  2 
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh

Simple merge
Simple merge
Simple merge
Simple merge