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: 319d100 0c4f032)

author	Samual <samual@xonotic.org>
	Tue, 4 Oct 2011 22:49:22 +0000 (18:49 -0400)
committer	Samual <samual@xonotic.org>
	Tue, 4 Oct 2011 22:49:22 +0000 (18:49 -0400)

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

Simple merge