Merge branch 'master' into Mario/cursor
authorterencehill <piuntn@gmail.com>
Tue, 7 Aug 2018 12:08:16 +0000 (14:08 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 7 Aug 2018 12:08:16 +0000 (14:08 +0200)
commite7e4e095eaeac5b8dbc60723f239547bdee88ef5
tree28aa39c1377e514947108021f1ee9f1cee9fa1d6
parent67bd78a77aece6ed531a73ef670bd4ae4265fd26
parent4e9982303475e2dc97a6315857919f66a0c9d177
Merge branch 'master' into Mario/cursor
qcsrc/client/hud/hud.qc
qcsrc/client/hud/panel/quickmenu.qc
qcsrc/client/hud/panel/radar.qc
qcsrc/client/main.qc
qcsrc/client/mapvoting.qc
qcsrc/client/view.qc