]> 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: de80fdc 19ad7dc)
Merge branch 'martin-t/okc3' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 10 Feb 2018 15:27:27 +0000 (16:27 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 10 Feb 2018 15:27:27 +0000 (16:27 +0100)

Trivial merge