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: f490247 8d640f8)

author	Jakob MG <jakob_mg@hotmail.com>
	Sat, 9 Apr 2011 05:40:58 +0000 (07:40 +0200)
committer	Jakob MG <jakob_mg@hotmail.com>
	Sat, 9 Apr 2011 05:40:58 +0000 (07:40 +0200)

		1	2
qcsrc/server/ctf.qc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge