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: 618d270 1c4428c)

author	Samual <samual@xonotic.org>
	Wed, 9 Mar 2011 15:45:36 +0000 (10:45 -0500)
committer	Samual <samual@xonotic.org>
	Wed, 9 Mar 2011 15:45:36 +0000 (10:45 -0500)

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

Simple merge