]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 1be4d7d 2f8a74f)
Merge branch 'Spike29/space-elevator_fix154' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 20 Oct 2018 18:08:59 +0000 (18:08 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 20 Oct 2018 18:08:59 +0000 (18:08 +0000)
Add two missing patches below the map, fix #154

Closes #154

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


Trivial merge