Merge commit 'ca4a8002f895c3474b3a5087ff027c31dadc712f' into master-merge

author Thomas Debesse <dev@illwieckz.net>

Mon, 20 Jun 2022 02:40:16 +0000 (04:40 +0200)

committer Thomas Debesse <dev@illwieckz.net>

Mon, 20 Jun 2022 02:40:16 +0000 (04:40 +0200)
author Thomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:40:16 +0000 (04:40 +0200)
committer Thomas Debesse <dev@illwieckz.net>
Mon, 20 Jun 2022 02:40:16 +0000 (04:40 +0200)
diff --cc radiant/brushmanip.cpp
Simple merge
diff --cc radiant/camwindow.cpp
Simple merge
diff --cc radiant/environment.cpp
Simple merge
diff --cc radiant/environment.h
Simple merge
diff --cc radiant/main.cpp
Simple merge
diff --cc radiant/mainframe.cpp
Simple merge
author	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 02:40:16 +0000 (04:40 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 02:40:16 +0000 (04:40 +0200)
		1	2
radiant/brushmanip.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/camwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/environment.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/environment.h	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	patch \|	diff1 \|	diff2 \|	blob \| history