]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Fix conflict
authorMirio <opivy@hotmail.de>
Tue, 21 Mar 2017 18:26:28 +0000 (19:26 +0100)
committerMirio <opivy@hotmail.de>
Tue, 21 Mar 2017 18:26:28 +0000 (19:26 +0100)
commit431b49cfd694623386ac10973f3176a6698afbf5
treee1b26aa99a93078ce50be60e85e92315f3af882e
parent5a253ba0c437784ab50efa605c8883133bb47849
parenta057cefaefd28c547a09bae76c6c1d57e02cc779
Fix conflict
maps/dance.map.options