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

[Matthias Clasen <matthiasc src gnome org>]

commit fca19e72ad079c2728b95b4a26b86312c9c887c7
Merge: 0ec017fcc0 98d2320c93
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jun 5 22:13:21 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Docs: Tweaks
    
    Closes #3638
    
    See merge request GNOME/gtk!3639

 docs/reference/gtk/migrating-3to4.md             |  3 +
 gdk/gdk.c                                        |  5 +-
 gdk/gdkcursor.c                                  |  2 +-
 gdk/gdkdisplay.c                                 |  8 +--
 gdk/gdkdisplaymanager.c                          |  3 +-
 gdk/gdkframeclock.c                              |  6 +-
 testsuite/tools/simplify-data-3to4/box.expected  | 78 ++++++++++++++++++++++--
 testsuite/tools/simplify-data-3to4/grid.expected |  5 ++
 tools/gtk-builder-tool-simplify.c                |  1 +
 9 files changed, 93 insertions(+), 18 deletions(-)
---