]> 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: 0752aa0 349c2b7)
Merge branch 'Mario/rocket_wall_fix' into 'master'
authorMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:47:11 +0000 (15:47 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 6 Nov 2020 15:47:11 +0000 (15:47 +0000)
Merge branch Mario/rocket_wall_fix (XS merge request)

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


Trivial merge