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

]> de.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: 123e284 2b25166)

author	Samual <samual@xonotic.org>
	Mon, 24 Oct 2011 20:30:16 +0000 (16:30 -0400)
committer	Samual <samual@xonotic.org>
	Mon, 24 Oct 2011 20:30:16 +0000 (16:30 -0400)

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

Simple merge