]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a00dc6 2f43b46)
Merge branch 'Mario/electro_combo_over_time_effect' into Mario/electro_combo_over_time
authorMario <mario.mario@y7mail.com>
Wed, 30 Oct 2024 10:46:03 +0000 (20:46 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 30 Oct 2024 10:46:03 +0000 (20:46 +1000)

Trivial merge