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: 4e2837f bfad6aa)

author	Nick S <nick@teichisma.info>
	Thu, 27 Apr 2023 20:38:48 +0000 (23:38 +0300)
committer	Nick S <nick@teichisma.info>
	Thu, 27 Apr 2023 20:38:48 +0000 (23:38 +0300)

		1	2
bal-wep-xdf.cfg	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge