]> 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: d8d8ce5 301998f)
Merge branch 'TimePath/issues/1971' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 25 Apr 2018 13:00:11 +0000 (13:00 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 25 Apr 2018 13:00:11 +0000 (13:00 +0000)
Fix #1971 "Backtrace on stormkeep"

Closes #1971

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


Trivial merge