]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ba920d 3fc1432)
Merge branch 'cortez/finalrage' into 'master'
authorSpiKe <leguen.yannick@gmail.com>
Fri, 17 Jun 2022 08:41:10 +0000 (08:41 +0000)
committerSpiKe <leguen.yannick@gmail.com>
Fri, 17 Jun 2022 08:41:10 +0000 (08:41 +0000)
cortez/finalrage

Closes #179, #178, and #177

See merge request xonotic/xonotic-maps.pk3dir!155


Trivial merge