]> 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: c89e099 1a992df)
Merge branch 'master' into martin-t/okc2
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 9 Sep 2017 19:24:15 +0000 (21:24 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 9 Sep 2017 19:24:15 +0000 (21:24 +0200)

Trivial merge