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)
commite044c33d2e56a13837659b0cdb0ac9a2e6242957
tree73309387c17c2e269c47ca23962770db7c28c076
parentb5183381a035603863e3b2c04df3d1c67499bea8
parent95888e34602b7444871ee3b12330afd985bede6b
Merge branch 'master' into Mario/cursor
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/main.qc
qcsrc/client/view.qc