]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/scoreboard_item_stats
authorMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 23:55:38 +0000 (09:55 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 18 Oct 2020 23:55:38 +0000 (09:55 +1000)
commit873f1b3ef177d3b290982be4adb3707482b8c6fc
tree99639fb2f1955fc99af2008a7c35e9a953da032c
parent0c75b5bb685121ce61a9cf2cd4562cda48493b54
parentf248163cf275038cd007886e8763382c6e85a25c
Merge branch 'master' into terencehill/scoreboard_item_stats
qcsrc/client/hud/panel/scoreboard.qc
qcsrc/common/items/inventory.qh