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

[Matthias Clasen <matthiasc src gnome org>]

commit 74a41eeb70240a40de8c138ad11f7bfef32ebe13
Merge: ff01067b8b ff874318c0
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jun 4 20:24:23 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    docs: Mention <packing> in migration guide
    
    Closes #3950 and #2271
    
    See merge request GNOME/gtk!3630

 gsk/gskroundedrect.c        | 12 +++++++++++-
 gtk/gtkbuilderparser.c      |  1 -
 gtk/gtkcellareaboxcontext.c |  1 -
 gtk/gtkcssenumvalue.c       |  4 ++--
 gtk/gtkcsskeyframes.c       |  4 ++--
 gtk/gtkcssnodedeclaration.c |  1 -
 gtk/gtkexpression.c         |  1 -
 gtk/gtkicontheme.c          |  2 +-
 gtk/gtkiconview.c           |  6 +++---
 gtk/gtkroundedbox.c         |  1 -
 10 files changed, 19 insertions(+), 14 deletions(-)
---