]> 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: 1deb523 e6dd876)
Merge branch 'martin-t/okc' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:57:50 +0000 (18:57 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 16:57:50 +0000 (18:57 +0200)

Trivial merge