]> 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: f5b2f43 314ab21)
Merge branch 'martin-t/overkill' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 15 Mar 2017 21:02:22 +0000 (21:02 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 15 Mar 2017 21:02:22 +0000 (21:02 +0000)
Default overkill config

See merge request !424


Trivial merge