Merge branch 'master' into terencehill/quickmenu
authorterencehill <piuntn@gmail.com>
Thu, 27 Aug 2015 15:18:41 +0000 (17:18 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 27 Aug 2015 15:18:41 +0000 (17:18 +0200)
1  2 
qcsrc/client/hud.qc
qcsrc/client/main.qc
qcsrc/client/scoreboard.qc
qcsrc/client/view.qc

Simple merge
Simple merge
Simple merge
Simple merge