Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into...
authorMirio <opivy@hotmail.de>
Tue, 17 Jun 2014 12:38:57 +0000 (14:38 +0200)
committerMirio <opivy@hotmail.de>
Tue, 17 Jun 2014 12:38:57 +0000 (14:38 +0200)
commitbbd1569b4737e041e29a811be213e964112df88e
tree0d05078f988ed9ca028ab850975e7a3953d3dc72
parenta3f29ed6da82e39b5b7ee2517be0490f11e09689
parent50c05a648d1edd07e90762965c4339122c5028d5
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into mirio/glowplant
maps/glowplant.mapinfo