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

[Matthias Clasen <matthiasc src gnome org>]

commit 48f87c1eeab18e32352f048d09c706bb20c4b090
Merge: 1a3f2acb95 c5aa35f8ef
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Mar 21 20:48:04 2021 +0000

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

 gsk/gl/gskglglyphcache.c            |  6 ++--
 gsk/ngl/gsknglcommandqueue.c        |  4 ---
 gsk/ngl/gsknglcommandqueueprivate.h |  3 --
 gsk/ngl/gsknglglyphlibrary.c        |  6 ++--
 gsk/ngl/gsknglglyphlibraryprivate.h |  4 ++-
 gtk/gtkcalendar.c                   |  4 +--
 gtk/inspector/prop-editor.c         | 65 ++++++++++++++++++++++++++++++++++---
 meson.build                         |  2 +-
 8 files changed, 73 insertions(+), 21 deletions(-)
---