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: 7b76e69 6796c18)

author	Samual <samual@xonotic.org>
	Tue, 3 Jan 2012 16:44:59 +0000 (11:44 -0500)
committer	Samual <samual@xonotic.org>
	Tue, 3 Jan 2012 16:44:59 +0000 (11:44 -0500)

		1	2
qcsrc/common/util.qc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge