]> 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: c8590ef e6dd876)
Merge branch 'martin-t/okc' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 27 Aug 2017 19:20:22 +0000 (19:20 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 27 Aug 2017 19:20:22 +0000 (19:20 +0000)
Overkill casual step 1

See merge request !464


Trivial merge