]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/electro_combo_over_time
authorMario <mario.mario@y7mail.com>
Mon, 21 Nov 2022 03:04:43 +0000 (13:04 +1000)
committerMario <mario.mario@y7mail.com>
Mon, 21 Nov 2022 03:04:43 +0000 (13:04 +1000)
1  2 
qcsrc/common/weapons/weapon/electro.qc
qcsrc/server/damage.qc

Simple merge