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)
1  2 
qcsrc/client/Main.qc
qcsrc/client/scoreboard.qc

Simple merge
Simple merge