Merge branch 'master' into terencehill/hud_code_cleanup
authorterencehill <piuntn@gmail.com>
Thu, 30 Jan 2014 00:59:33 +0000 (01:59 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 30 Jan 2014 00:59:33 +0000 (01:59 +0100)
commite7e55b1a2aa1c0fdd3dad3e72a92370dca8023ea
treeebc8a446071d6b7a7f2bff009c08cb4d4cb3e9fb
parentbd85f2ce718e898726461e23dcb623f94c6be213
parent7e9d4404fbd602050e843cb2169f8afab4163b11
Merge branch 'master' into terencehill/hud_code_cleanup
qcsrc/client/Main.qc
qcsrc/client/scoreboard.qc