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: 785ffe1 33e2e50)

author	Mario <zacjardine@y7mail.com>
	Fri, 4 Dec 2020 14:06:32 +0000 (00:06 +1000)
committer	Mario <zacjardine@y7mail.com>
	Fri, 4 Dec 2020 14:06:32 +0000 (00:06 +1000)

		1	2
qcsrc/menu/xonotic/_mod.qh	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge