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: a52ea19 297e90c)

author	Samual <samual@xonotic.org>
	Mon, 29 Aug 2011 05:52:13 +0000 (01:52 -0400)
committer	Samual <samual@xonotic.org>
	Mon, 29 Aug 2011 05:52:13 +0000 (01:52 -0400)

		1	2
qcsrc/client/View.qc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge