]> 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: 9d3095b 7c363b8)
Merge branch 'Mario/overkill' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 28 Jan 2017 11:36:05 +0000 (11:36 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 28 Jan 2017 11:36:05 +0000 (11:36 +0000)
Merge branch Mario/overkill (S merge request)

See merge request !407


Trivial merge