git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff

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

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f8ca9c bfc7e0e)

author	Mario <mario@smbclan.net>
	Fri, 17 Jun 2016 08:06:43 +0000 (18:06 +1000)
committer	Mario <mario@smbclan.net>
	Fri, 17 Jun 2016 08:06:43 +0000 (18:06 +1000)

		1	2
commands.cfg	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge