]> 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: bb7483c 17659a0)
Merge branch 'martin-t/whoosh' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 11 Aug 2019 10:34:55 +0000 (10:34 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 11 Aug 2019 10:34:55 +0000 (10:34 +0000)
Fixes for nex whoosh

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


Trivial merge