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: b34fc82 a8b77d9)

author	unknown <samual@xonotic.org>
	Fri, 26 Nov 2010 10:08:00 +0000 (05:08 -0500)
committer	unknown <samual@xonotic.org>
	Fri, 26 Nov 2010 10:08:00 +0000 (05:08 -0500)

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

Simple merge