]> de.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: be8b31b cab778c)
Merge branch 'master' into Mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 00:16:21 +0000 (01:16 +0100)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 00:16:21 +0000 (01:16 +0100)

Trivial merge