]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c691bc8 9a753b4)
Merge branch 'Mario/arc_bolt_bounce' into 'master'
authorMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 16:27:07 +0000 (16:27 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 16:27:07 +0000 (16:27 +0000)
Merge branch Mario/arc_bolt_bounce (S merge request)

See merge request xonotic/xonotic-data.pk3dir!853


Trivial merge