]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/csqc_muzzleflash
authorMario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 18:48:30 +0000 (04:48 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 18:48:30 +0000 (04:48 +1000)
1  2 
qcsrc/common/weapons/all.qh

Simple merge