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: ed3a4b0 a084941)

author	Samual <samual@xonotic.org>
	Mon, 26 Sep 2011 16:34:09 +0000 (12:34 -0400)
committer	Samual <samual@xonotic.org>
	Mon, 26 Sep 2011 16:34:09 +0000 (12:34 -0400)

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

Simple merge