]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit89c18cece1794585853380808f24e60456f4b5a3
treece69eaf80914a8cf3a13e73726f94e41d6690fa6
parent309f456c7264e79ff92d5e6efb1120edc9f701c8
parentc95332a95bd61d0c1734e92c9675ee3657dc2fa3
Merge branch 'master' into Mario/electro_combo_over_time
qcsrc/server/g_damage.qc