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

[Matthias Clasen <matthiasc src gnome org>]

commit 4a43c77f6680e828df12440f715b05109e8b4226
Merge: dffbcd8fdf 55936087e0
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jun 19 16:17:27 2020 +0000

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

 demos/gtk-demo/demotaggedentry.c | 114 ++++++++++++---------------------------
 demos/gtk-demo/demotaggedentry.h |  38 ++-----------
 gtk/gtkcolumnviewcolumn.c        |   4 +-
 gtk/gtknotebook.c                |   1 +
 4 files changed, 44 insertions(+), 113 deletions(-)
---