]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/qc_stats
authorMario <mario.mario@y7mail.com>
Fri, 29 May 2020 09:53:19 +0000 (19:53 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 29 May 2020 09:53:19 +0000 (19:53 +1000)
commitdc44e46c250b3110b22cce3f5b8d957e033543ef
tree008bd1510742941636cd722a1fe44cde5fef3976
parentec8814914691876d017a9758c8f22a4d47540478
parent9a04df193299873a8133651e4579dbfc2253b717
Merge branch 'master' into Mario/qc_stats
qcsrc/client/hud/panel/weapons.qc
qcsrc/client/view.qc
qcsrc/common/weapons/all.qc
qcsrc/lib/fteqcc.log
qcsrc/lib/stats.qh
qcsrc/tools/fteqcc.log