]> 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: 9179659 76e821a)
Merge branch 'Mario/overkill' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 17 Dec 2014 17:40:47 +0000 (17:40 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 17 Dec 2014 17:40:47 +0000 (17:40 +0000)
Merge branch Mario/overkill (L merge request)

Overkill mutator, cleaned up and stable enough for merge (I hope).

See merge request !57


Trivial merge