]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/survival
authorMario <mario.mario@y7mail.com>
Sun, 2 Aug 2020 11:12:10 +0000 (21:12 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 2 Aug 2020 11:12:10 +0000 (21:12 +1000)
1  2 
qcsrc/client/hud/panel/scoreboard.qc

Simple merge