Merge branch 'Mirio/implosion' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3di...
authorMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:11:33 +0000 (01:11 +0100)
committerMirio <opivy@hotmail.de>
Thu, 27 Nov 2014 00:11:33 +0000 (01:11 +0100)
commit470eacc10c95190a843191e9d3b329349c2b17f6
tree7196541518fa41e95c625a8b949b30e30e7e0ae3
parentfc9b446bf7b274712a1b132ea0e0037ff8cb79e0
parent33123fe70e18cdaa8b15825597d75723d75575ae
Merge branch 'Mirio/implosion' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into mirio/implosion