[pango: 8/8] Merge branch 'matthiasc/for-master' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 47e75d6fcb32c5a59dca30b2b8ebf6a30d0e83f4
Merge: 96bcf49c 2926528b
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jul 10 14:42:12 2021 +0000

    Merge branch 'matthiasc/for-master' into 'master'
    
    Add a way to show fonts in test-layout output
    
    See merge request GNOME/pango!371

 pango/pango-emoji.c     |  6 ------
 pango/pango-language.c  | 20 +++++++++++---------
 pango/pangofc-fontmap.c | 13 ++++++-------
 tests/test-common.c     |  3 ++-
 tests/test-layout.c     |  8 ++++++--
 5 files changed, 25 insertions(+), 25 deletions(-)
---