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: 3369a05 7e7a410)

author	Lyberta <lyberta@lyberta.net>
	Wed, 30 Aug 2017 05:07:32 +0000 (08:07 +0300)
committer	Lyberta <lyberta@lyberta.net>
	Wed, 30 Aug 2017 05:07:32 +0000 (08:07 +0300)

		1	2
qcsrc/common/t_items.qc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge