Merge commit '6352fbdd7968d7dffa2ba4c57ee5cade250e04ed' into master-merge

author Thomas Debesse <dev@illwieckz.net>

Tue, 21 Jun 2022 04:05:55 +0000 (06:05 +0200)

committer Thomas Debesse <dev@illwieckz.net>

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