]> 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: b2d3d16 2c2a008)
Merge branch 'master' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 00:37:01 +0000 (02:37 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 29 Aug 2017 00:37:01 +0000 (02:37 +0200)

Trivial merge