]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/electro_combo_over_time
authorMario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 16:42:25 +0000 (02:42 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 16 Jul 2020 16:42:25 +0000 (02:42 +1000)
1  2 
qcsrc/server/g_damage.qc

Simple merge