[pango: 5/5] Merge branch 'matthiasc/for-main' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit 76eca4dce1d308780b5b6712896eebebdd77e79f
Merge: 0f661af3 af036f7b
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 29 05:07:29 2021 +0000

    Merge branch 'matthiasc/for-main' into 'main'
    
    fcfont: Cosmetics
    
    See merge request GNOME/pango!455

 pango/fonts.c              | 18 ++++++++++++++----
 pango/pango-font-private.h |  2 ++
 pango/pango-font.h         |  2 ++
 pango/pango-fontmap.h      |  3 +++
 pango/pango-item-private.h |  2 +-
 pango/pangofc-font.c       |  2 --
 pango/pangofc-fontmap.c    |  2 +-
 7 files changed, 23 insertions(+), 8 deletions(-)
---