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: dedcbd0 c9817f1)

author	Mario <mario.mario@y7mail.com>
	Tue, 1 Oct 2013 13:41:42 +0000 (06:41 -0700)
committer	Mario <mario.mario@y7mail.com>
	Tue, 1 Oct 2013 13:41:42 +0000 (06:41 -0700)

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

Simple merge