Merge branch 'master' into terencehill/scoreboard_item_stats

author terencehill <piuntn@gmail.com>

Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)

committer terencehill <piuntn@gmail.com>

Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)
author terencehill <piuntn@gmail.com>
Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)
committer terencehill <piuntn@gmail.com>
Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)
diff --cc qcsrc/client/hud/panel/scoreboard.qc
Simple merge
diff --cc qcsrc/client/hud/panel/scoreboard.qh
Simple merge
diff --cc qcsrc/client/mutators/events.qh
Simple merge
author	terencehill <piuntn@gmail.com>
	Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)
committer	terencehill <piuntn@gmail.com>
	Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)
		1	2
qcsrc/client/hud/panel/scoreboard.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/scoreboard.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/mutators/events.qh	patch \|	diff1 \|	diff2 \|	blob \| history