Merge branch 'upstream-sep2019-sfix' into subtree

author Niki Roo <niki@nikiroo.be>

Thu, 2 Jan 2020 17:19:24 +0000 (18:19 +0100)

committer Niki Roo <niki@nikiroo.be>

Thu, 2 Jan 2020 17:19:24 +0000 (18:19 +0100)
author Niki Roo <niki@nikiroo.be>
Thu, 2 Jan 2020 17:19:24 +0000 (18:19 +0100)
committer Niki Roo <niki@nikiroo.be>
Thu, 2 Jan 2020 17:19:24 +0000 (18:19 +0100)
diff --cc TButton.java
Simple merge
diff --cc TWidget.java
Simple merge
author	Niki Roo <niki@nikiroo.be>
	Thu, 2 Jan 2020 17:19:24 +0000 (18:19 +0100)
committer	Niki Roo <niki@nikiroo.be>
	Thu, 2 Jan 2020 17:19:24 +0000 (18:19 +0100)
		1	2
TButton.java	patch \|	diff1 \|	diff2 \|	blob \| history
TWidget.java	patch \|	diff1 \|	diff2 \|	blob \| history