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)
commitad444437c8652444006ef4e5261c26984050dbc3
tree7d2915ef0a0b6bf37d9bd8474ce5f21e7b658074
parent147ece6f20af2491f707700e0714d1da199d1eb5
parent2eb667170068c570763b07108da07c05622a4f93
Merge branch 'master' into terencehill/hud_code_restructure
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh