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: 14c1ca0 61105a8)

author	Samual <samual@xonotic.org>
	Mon, 12 Sep 2011 07:27:41 +0000 (03:27 -0400)
committer	Samual <samual@xonotic.org>
	Mon, 12 Sep 2011 07:27:41 +0000 (03:27 -0400)

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

Simple merge