Merge commit 'd7763cb7e0d7f6c16cc45335f344385fa6f73ac5' into master-merge

author Thomas Debesse <dev@illwieckz.net>

Tue, 21 Jun 2022 02:02:30 +0000 (04:02 +0200)

committer Thomas Debesse <dev@illwieckz.net>

Tue, 21 Jun 2022 02:02:30 +0000 (04:02 +0200)
author Thomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:02:30 +0000 (04:02 +0200)
committer Thomas Debesse <dev@illwieckz.net>
Tue, 21 Jun 2022 02:02:30 +0000 (04:02 +0200)
diff --cc radiant/camwindow.cpp
Simple merge
diff --cc radiant/xywindow.cpp
Simple merge
author	Thomas Debesse <dev@illwieckz.net>
	Tue, 21 Jun 2022 02:02:30 +0000 (04:02 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Tue, 21 Jun 2022 02:02:30 +0000 (04:02 +0200)
		1	2
radiant/camwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history