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: 581118c 19af1df)

author	Nick S <nick@teichisma.info>
	Fri, 7 Oct 2022 10:02:02 +0000 (13:02 +0300)
committer	Nick S <nick@teichisma.info>
	Fri, 7 Oct 2022 10:02:02 +0000 (13:02 +0300)

		1	2
_hud_common.cfg	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge