git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff

]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff

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

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c05be9 3b999c0)

author	Lyberta <lyberta@lyberta.net>
	Mon, 8 Jan 2018 16:11:59 +0000 (19:11 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Mon, 8 Jan 2018 16:11:59 +0000 (19:11 +0300)

		1	2
maps/implosion.mapinfo	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge