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: f945f5d 7683d22)

author	Nick S <nick@teichisma.info>
	Thu, 11 May 2023 12:14:21 +0000 (15:14 +0300)
committer	Nick S <nick@teichisma.info>
	Thu, 11 May 2023 12:14:21 +0000 (15:14 +0300)

		1	2
qcsrc/server/main.qc	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge