]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
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)
commitfa9e5082afbb1ed81aee66c960c39e48e1204b08
tree35ad4fd86a0e1f129431cd9143c06b62dbf53df7
parent8865b7783c8bb0fb2c85d674ee00814acf42d5bb
parentc50b2e0373ece7d78ce01ad9186d8bff462fc733
Merge branch 'Mirio/geoplanetary' into 'master'

Mirio/geoplanetary

See merge request !67