]> 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: c29f94e 573c836)
Merge branch 'terencehill/overkill_stuff' into 'master'
authorMario <zacjardine@y7mail.com>
Thu, 6 Oct 2016 12:49:45 +0000 (12:49 +0000)
committerMario <zacjardine@y7mail.com>
Thu, 6 Oct 2016 12:49:45 +0000 (12:49 +0000)
Overkill stuff

It addresses issues reported in #1815. It closes #1815

See merge request !371


Trivial merge