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: fd5886b 7afe3ea)

author	FruitieX <fruitiex@gmail.com>
	Thu, 25 Nov 2010 21:31:29 +0000 (23:31 +0200)
committer	FruitieX <fruitiex@gmail.com>
	Thu, 25 Nov 2010 21:31:29 +0000 (23:31 +0200)

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

Simple merge