Merge branch 'upstream-sep2019-tcombo' into subtree

author Niki Roo <niki@nikiroo.be>

Thu, 24 Oct 2019 07:08:20 +0000 (09:08 +0200)

committer Niki Roo <niki@nikiroo.be>

Thu, 24 Oct 2019 07:08:20 +0000 (09:08 +0200)
author Niki Roo <niki@nikiroo.be>
Thu, 24 Oct 2019 07:08:20 +0000 (09:08 +0200)
committer Niki Roo <niki@nikiroo.be>
Thu, 24 Oct 2019 07:08:20 +0000 (09:08 +0200)
diff --cc TComboBox.java
Simple merge
diff --cc TWidget.java
Simple merge
author	Niki Roo <niki@nikiroo.be>
	Thu, 24 Oct 2019 07:08:20 +0000 (09:08 +0200)
committer	Niki Roo <niki@nikiroo.be>
	Thu, 24 Oct 2019 07:08:20 +0000 (09:08 +0200)
		1	2
TComboBox.java	patch \|	diff1 \|	diff2 \|	blob \| history
TWidget.java	patch \|	diff1 \|	diff2 \|	blob \| history