Merge commit 'f93b3f61846b91a5679daca40a5f23e355ac787b' into garux-merge

author Thomas Debesse <dev@illwieckz.net>

Mon, 25 May 2020 18:19:15 +0000 (20:19 +0200)

committer Thomas Debesse <dev@illwieckz.net>

Mon, 25 May 2020 18:19:15 +0000 (20:19 +0200)
author Thomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 18:19:15 +0000 (20:19 +0200)
committer Thomas Debesse <dev@illwieckz.net>
Mon, 25 May 2020 18:19:15 +0000 (20:19 +0200)
diff --cc radiant/selection.cpp
Simple merge
diff --cc radiant/xywindow.cpp
Simple merge
author	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 18:19:15 +0000 (20:19 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 18:19:15 +0000 (20:19 +0200)
		1	2
radiant/selection.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history