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: b14b318 67440b9)

author	Lyberta <lyberta@lyberta.net>
	Mon, 19 Mar 2018 15:57:43 +0000 (18:57 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Mon, 19 Mar 2018 15:57:43 +0000 (18:57 +0300)

		1	2
qcsrc/server/defs.qh	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge