[gtk: 4/4] Merge branch 'wip/baedert/for-master' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit 2636fb7c8d3c9f8d6cb73acdb1499597baa008d9
Merge: 99c2936e90 ceb61e6600
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Dec 17 00:31:20 2021 +0000

    Merge branch 'wip/baedert/for-master' into 'main'
    
    settings test: Print expected and seen values
    
    See merge request GNOME/gtk!4259

 gsk/gl/gskglcommandqueue.c  |  4 ++--
 gtk/gtktextlayout.c         | 26 +++-----------------------
 testsuite/tools/settings.in |  9 ++++++---
 3 files changed, 11 insertions(+), 28 deletions(-)
---