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)
commite8e214d23e2cab174facf54bf032bdde8d1e5304
treef34dab988de521501ef0bf1acd21bdd4f56ce98d
parent93c49cf4265dd4ec35272b1c6b2e3f2a7363893e
parent646081a826cec9d84947678e4bcef394bf854d5a
Merge branch 'master' into terencehill/quickmenu
qcsrc/client/hud.qc
qcsrc/client/main.qc
qcsrc/client/scoreboard.qc
qcsrc/client/view.qc