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: 26bd5b7 b458653)

author	Samual <samual@xonotic.org>
	Wed, 30 Mar 2011 06:40:08 +0000 (02:40 -0400)
committer	Samual <samual@xonotic.org>
	Wed, 30 Mar 2011 06:40:08 +0000 (02:40 -0400)

		1	2
qcsrc/server/progs.src	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge