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: 43248ad 1ee23a8)

author	Samual <samual@xonotic.org>
	Mon, 16 Jan 2012 17:31:30 +0000 (12:31 -0500)
committer	Samual <samual@xonotic.org>
	Mon, 16 Jan 2012 17:31:30 +0000 (12:31 -0500)

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

Simple merge