Merge commit '4ee1a6ee1ae75d52984e54e689ef1e587b384bcb' into master-merge

author Thomas Debesse <dev@illwieckz.net>

Mon, 20 Jun 2022 03:47:32 +0000 (05:47 +0200)

committer Thomas Debesse <dev@illwieckz.net>

Mon, 20 Jun 2022 03:47:32 +0000 (05:47 +0200)
author Thomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 03:47:32 +0000 (05:47 +0200)
committer Thomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 03:47:32 +0000 (05:47 +0200)
diff --cc Makefile
Simple merge
diff --cc radiant/mainframe.cpp
Simple merge
diff --cc radiant/texwindow.cpp
Simple merge
author	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 03:47:32 +0000 (05:47 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 03:47:32 +0000 (05:47 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/texwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history