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

[Matthias Clasen <matthiasc src gnome org>]

commit 2c9bf55eea71f1de0ee9dc93f030a4fd78200cc8
Merge: 1d11d42aa0 361407201b
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Nov 17 01:07:34 2020 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Matthiasc/for master
    
    See merge request GNOME/gtk!2846

 demos/widget-factory/widget-factory.ui | 235 ---------------------------------
 docs/reference/gdk/gdk4-sections.txt   |   2 +-
 docs/reference/gtk/building.md         |   3 +-
 docs/reference/gtk/gtk4-sections.txt   |   1 -
 gdk/wayland/gdkdisplay-wayland.c       |   2 +
 gsk/gskglshader.c                      |   6 +-
 6 files changed, 8 insertions(+), 241 deletions(-)
---