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

[Matthias Clasen <matthiasc src gnome org>]

commit 5ff9f4a435178e1c40ce0c37376310afa584982f
Merge: bd1649e5f4 b7cab5c5eb
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Oct 18 18:00:33 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Small fixes
    
    Closes #4248
    
    See merge request GNOME/gtk!4072

 .gitlab-ci.yml                   | 1 +
 gdk/gdkdevice.c                  | 2 +-
 gdk/gdkglcontext.c               | 2 +-
 gdk/gdktexture.c                 | 1 +
 gdk/gdktypes.h                   | 2 +-
 gdk/gdkvulkancontext.c           | 2 +-
 gdk/macos/gdkmacoseventsource.c  | 2 +-
 gdk/wayland/gdkdisplay-wayland.c | 2 +-
 gdk/win32/gdksurface-win32.h     | 2 +-
 gsk/gskglshader.c                | 2 +-
 gtk/gtkrecentmanager.c           | 2 +-
 gtk/gtksnapshot.c                | 2 +-
 modules/media/gtkgstsink.c       | 2 +-
 13 files changed, 13 insertions(+), 11 deletions(-)
---