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: 0d43cb9 6125fd1)

author	Lyberta <lyberta@lyberta.net>
	Sun, 21 Jan 2018 03:10:28 +0000 (06:10 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Sun, 21 Jan 2018 03:10:28 +0000 (06:10 +0300)

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

Simple merge