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: 9f07061 c5fbf16)

author	Mario <zacjardine@y7mail.com>
	Fri, 19 Dec 2014 12:48:24 +0000 (23:48 +1100)
committer	Mario <zacjardine@y7mail.com>
	Fri, 19 Dec 2014 12:48:24 +0000 (23:48 +1100)

		1	2
effectinfo.txt	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge