git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff

]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff

projects / xonotic / xonotic-data.pk3dir.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1389e3 42065fe)

author	Lyberta <lyberta@lyberta.net>
	Thu, 25 May 2017 19:28:03 +0000 (22:28 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Thu, 25 May 2017 19:28:03 +0000 (22:28 +0300)

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

Simple merge