Merge branch 'master' into Mario/cursor 570/head
authorterencehill <piuntn@gmail.com>
Tue, 18 Sep 2018 12:02:25 +0000 (14:02 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 18 Sep 2018 12:02:25 +0000 (14:02 +0200)
1  2 
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/main.qc
qcsrc/client/view.qc

Simple merge
Simple merge
Simple merge