]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/qc_stats
authorMario <mario.mario@y7mail.com>
Sun, 14 Jun 2020 20:18:10 +0000 (06:18 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 14 Jun 2020 20:18:10 +0000 (06:18 +1000)
commit5b4dd1bb267836163dec0a6e1709721e645a43aa
treec274fd9c30397693d6cdc5da3bc51e5c3854cbcd
parentb294e1ff46bccefd8e0531d53c756cb40b030dc4
parent54a94b680cc578b0209a5f5ef7dab89502e171e4
Merge branch 'master' into Mario/qc_stats
qcsrc/client/hud/panel/healtharmor.qc
qcsrc/client/view.qc
qcsrc/common/weapons/all.qc