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

[Matthias Clasen <matthiasc src gnome org>]

commit 12e8a926089a393cd2b4d049f540365a0ef990c2
Merge: f5db501879 5bc3923bae
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Sep 28 22:24:13 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    builder: Simplify parameter collection
    
    See merge request GNOME/gtk!4006

 gtk/gtkbuilder.c                                   | 24 ++++++++++------------
 .../tools/simplify-data-3to4/toolbar.expected      |  4 +---
 tools/gtk-builder-tool-simplify.c                  | 13 ++++++------
 3 files changed, 18 insertions(+), 23 deletions(-)
---