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: 21a15a2 86bb7b9)

author	Nick S <nick@teichisma.info>
	Thu, 19 Jan 2023 19:41:34 +0000 (21:41 +0200)
committer	Nick S <nick@teichisma.info>
	Thu, 19 Jan 2023 19:41:34 +0000 (21:41 +0200)

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

Simple merge