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: 71e6c75 d787ef7)

author	Mario <zacjardine@y7mail.com>
	Thu, 25 Dec 2014 10:36:22 +0000 (21:36 +1100)
committer	Mario <zacjardine@y7mail.com>
	Thu, 25 Dec 2014 10:36:22 +0000 (21:36 +1100)

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

Simple merge