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: bceba9d 62308e4)

author	Mario <mario.mario@y7mail.com>
	Sat, 17 Oct 2020 00:42:43 +0000 (10:42 +1000)
committer	Mario <mario.mario@y7mail.com>
	Sat, 17 Oct 2020 00:42:43 +0000 (10:42 +1000)

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

Simple merge