]> 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: f43cfc6 8b45801)
Merge branch 'martin-t/okc3' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 21 Aug 2017 20:45:31 +0000 (22:45 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 21 Aug 2017 20:45:31 +0000 (22:45 +0200)

Trivial merge