]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit - maps/implosion.map.options
Merge branch 'Mirio/universaltrigger'
authorMirio <opivy@hotmail.de>
Thu, 27 Aug 2015 16:06:44 +0000 (18:06 +0200)
committerMirio <opivy@hotmail.de>
Thu, 27 Aug 2015 16:06:44 +0000 (18:06 +0200)
commit4c851763bf11da63cd01698d6ace3f81ffd5a28c
treeafe4b9baf37a1bbc7e9b07b42f1af0490536b2b8
parentd52e81c2caef88f7bf1db069562e34be7c7833b8
parent3bb23ba851f5eec231a7b906c90c3880dea35a66
Merge branch 'Mirio/universaltrigger'