]> de.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: fd9e890 b2e9de1)
Merge branch 'martin-t/fix1994' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 4 Nov 2018 17:13:55 +0000 (17:13 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 4 Nov 2018 17:13:55 +0000 (17:13 +0000)
Fix #1994 in a better way

Closes #1994

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


Trivial merge