Merge branch 'master' into terencehill/hud_code_cleanup
authorterencehill <piuntn@gmail.com>
Sun, 16 Jun 2013 15:00:06 +0000 (17:00 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 16 Jun 2013 15:00:06 +0000 (17:00 +0200)
commit52b68cb65b8c40a9363e67eaef7f1eca80bd56cf
treeb70514665fa9610d07320372881ba20d55d31f8d
parent9fc4bc2156cdd6d4f52c1ed6257effabf8c5d41f
parentad4d291fdd6f2a81df64207dd9d8004faf272604
Merge branch 'master' into terencehill/hud_code_cleanup

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/Main.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/scoreboard.qc