Merge commit 'ee4b663ef7227a42b5eb051698265bed514ab3c0' into master-merge

author Thomas Debesse <dev@illwieckz.net>

Mon, 20 Jun 2022 02:39:53 +0000 (04:39 +0200)

committer Thomas Debesse <dev@illwieckz.net>

Mon, 20 Jun 2022 02:39:53 +0000 (04:39 +0200)
author Thomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:39:53 +0000 (04:39 +0200)
committer Thomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:39:53 +0000 (04:39 +0200)
diff --cc radiant/main.cpp
Simple merge
diff --cc tools/quake3/q3map2/q3map2.h
Simple merge
author	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 02:39:53 +0000 (04:39 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 02:39:53 +0000 (04:39 +0200)
		1	2
radiant/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/q3map2.h	patch \|	diff1 \|	diff2 \|	blob \| history