]> 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: 9144099 7fb4dc7)
Merge branch 'martin-t/okc3' into martin-t/master
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 9 Sep 2017 19:25:11 +0000 (21:25 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 9 Sep 2017 19:25:11 +0000 (21:25 +0200)

Trivial merge