]> 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: 908b100 1ff9a19)
Merge branch 'martin-t/okc2' into martin-t/okc3
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 00:44:35 +0000 (02:44 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 00:44:35 +0000 (02:44 +0200)

Trivial merge