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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge