[pango: 2/2] Merge branch 'face-return' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 162eb43d59336656f578d6efc9100c7f390c72b2
Merge: b7a206e2 5af6340e
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Aug 7 00:00:12 2019 +0000

    Merge branch 'face-return' into 'master'
    
    Reinstate the return type of pango_fc_font_lock_face()
    
    See merge request GNOME/pango!125

 pango/pangocairo-fcfont.c    |  2 +-
 pango/pangofc-font-private.h | 16 +---------------
 pango/pangofc-font.c         |  2 +-
 pango/pangofc-font.h         |  4 +++-
 pango/pangoft2.c             |  4 ++--
 pango/pangoxft-font.c        |  6 +++---
 6 files changed, 11 insertions(+), 23 deletions(-)
---