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: 8683f95 e6bb286)

author	Mario <mario.mario@y7mail.com>
	Tue, 6 Aug 2013 14:07:02 +0000 (00:07 +1000)
committer	Mario <mario.mario@y7mail.com>
	Tue, 6 Aug 2013 14:07:02 +0000 (00:07 +1000)

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

Simple merge