]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitcbf87504129dc20b2acecd01642ddf4631f2ce2f
tree44f0ac1d5b1eba4b3197462233edfbb664be44ae
parentc6101f3b5acc10a23b79f72dfdc4c708ed70a103
parent91938c07769be75b1840199ba6ecc875fa584f95
Merge branch 'master' into Mario/electro_combo_over_time
qcsrc/common/weapons/weapon/electro.qc
qcsrc/server/damage.qc