[gtk: 3/3] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 6c4ab7d208fb3c7fffb699f43c5bd0e5512bb9cd
Merge: c3ca34cf51 dd52dd8bb0
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Nov 29 15:21:40 2019 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    some builder-tool tests
    
    See merge request GNOME/gtk!1220

 testsuite/tools/settings.in                  |  2 +-
 testsuite/tools/simplify-3to4.in             |  2 +-
 testsuite/tools/simplify-data/test9.expected | 13 +++++++++++++
 testsuite/tools/simplify-data/test9.ui       | 13 +++++++++++++
 testsuite/tools/simplify.in                  |  2 +-
 5 files changed, 29 insertions(+), 3 deletions(-)
---