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: a8e1109 9d89eb5)

author	unknown <samual@xonotic.org>
	Fri, 19 Nov 2010 22:51:58 +0000 (17:51 -0500)
committer	unknown <samual@xonotic.org>
	Fri, 19 Nov 2010 22:51:58 +0000 (17:51 -0500)

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

Simple merge