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

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

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

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f1bf04 cacea31)

author	Mario <zacjardine@y7mail.com>
	Sat, 13 Dec 2014 05:44:23 +0000 (16:44 +1100)
committer	Mario <zacjardine@y7mail.com>
	Sat, 13 Dec 2014 05:44:23 +0000 (16:44 +1100)

		1	2
scripts/shaderlist.txt	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge