git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff

projects / xonotic / xonotic-data.pk3dir.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd69929 9af625c)

author	FruitieX <fruitiex@gmail.com>
	Mon, 20 Dec 2010 14:04:31 +0000 (16:04 +0200)
committer	FruitieX <fruitiex@gmail.com>
	Mon, 20 Dec 2010 14:04:31 +0000 (16:04 +0200)

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

Simple merge