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: cf11653 c0ad70d)

author	Mirio <opivy@hotmail.de>
	Sun, 25 Dec 2016 13:42:41 +0000 (14:42 +0100)
committer	Mirio <opivy@hotmail.de>
	Sun, 25 Dec 2016 13:42:41 +0000 (14:42 +0100)

		1	2
maps/dance.map	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge