]> 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: 34bfade ff958ce)
Merge branch 'martin-t/ok-config' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 18 Aug 2019 10:06:19 +0000 (10:06 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 18 Aug 2019 10:06:19 +0000 (10:06 +0000)
Overkill config

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


Trivial merge