]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/arc_bolt_bounce
authorMario <mario.mario@y7mail.com>
Mon, 12 Oct 2020 16:59:55 +0000 (02:59 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 12 Oct 2020 16:59:55 +0000 (02:59 +1000)
1  2 
qcsrc/common/weapons/weapon/arc.qc

Simple merge