]> 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: 8865b77 c50b2e0)
Merge branch 'Mirio/geoplanetary' into 'master'
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:26:11 +0000 (20:26 +0000)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:26:11 +0000 (20:26 +0000)
Mirio/geoplanetary

See merge request !67


Trivial merge