Merge branch 'upstream-sep2019-sfix' into subtree
authorNiki Roo <niki@nikiroo.be>
Thu, 2 Jan 2020 17:19:24 +0000 (18:19 +0100)
committerNiki Roo <niki@nikiroo.be>
Thu, 2 Jan 2020 17:19:24 +0000 (18:19 +0100)
1  2 
TButton.java
TWidget.java

diff --cc TButton.java
Simple merge
diff --cc TWidget.java
Simple merge