Merge branch 'master' into Mario/cursor

author terencehill <piuntn@gmail.com>

Tue, 7 Aug 2018 12:08:16 +0000 (14:08 +0200)

committer terencehill <piuntn@gmail.com>

Tue, 7 Aug 2018 12:08:16 +0000 (14:08 +0200)
author terencehill <piuntn@gmail.com>
Tue, 7 Aug 2018 12:08:16 +0000 (14:08 +0200)
committer terencehill <piuntn@gmail.com>
Tue, 7 Aug 2018 12:08:16 +0000 (14:08 +0200)
diff --cc qcsrc/client/hud/hud.qc
Simple merge
diff --cc qcsrc/client/hud/panel/quickmenu.qc
Simple merge
diff --cc qcsrc/client/hud/panel/radar.qc
Simple merge
diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/mapvoting.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge
author	terencehill <piuntn@gmail.com>
	Tue, 7 Aug 2018 12:08:16 +0000 (14:08 +0200)
committer	terencehill <piuntn@gmail.com>
	Tue, 7 Aug 2018 12:08:16 +0000 (14:08 +0200)
		1	2
qcsrc/client/hud/hud.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/quickmenu.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/radar.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/mapvoting.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	patch \|	diff1 \|	diff2 \|	blob \| history