]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a706657 08c1a7d)
Merge branch 'master' into t0uYK8Ne/erbium
authorMirio <opivy@hotmail.de>
Sat, 22 Jul 2017 14:33:07 +0000 (16:33 +0200)
committerMirio <opivy@hotmail.de>
Sat, 22 Jul 2017 14:33:07 +0000 (16:33 +0200)

Trivial merge