de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit

]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit

projects / xonotic / xonotic-maps.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a3f29ed 50c05a6)

author	Mirio <opivy@hotmail.de>
	Tue, 17 Jun 2014 12:38:57 +0000 (14:38 +0200)
committer	Mirio <opivy@hotmail.de>
	Tue, 17 Jun 2014 12:38:57 +0000 (14:38 +0200)
commit	bbd1569b4737e041e29a811be213e964112df88e
tree	0d05078f988ed9ca028ab850975e7a3953d3dc72	tree \| snapshot
parent	a3f29ed6da82e39b5b7ee2517be0490f11e09689	commit \| diff
parent	50c05a648d1edd07e90762965c4339122c5028d5	commit \| diff

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into mirio/glowplant

maps/glowplant.mapinfo