Merge branch 'master' into terencehill/scoreboard_item_stats
authorterencehill <piuntn@gmail.com>
Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 2 Nov 2020 09:49:30 +0000 (10:49 +0100)
1  2 
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/client/hud/panel/scoreboard.qh
qcsrc/client/mutators/events.qh

Simple merge
Simple merge
Simple merge