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



commit 1fb9e50c73bb8c6389c7eaa9adb2eee13642d2ff
Merge: 0b32b337 f6032b75
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jun 8 17:39:50 2020 +0000

    Merge branch 'for-master' into 'master'
    
    For master
    
    See merge request GNOME/pango!184

 pango/fonts.c              |  2 +-
 pango/meson.build          | 48 +++++++++++++++++++++++++++-------------------
 pango/pango-ot-buffer.c    | 14 ++++++++++++++
 pango/pango-ot-ruleset.c   |  4 ++++
 pango/pango-ot.h           | 10 ++++++++++
 pango/pangocairo-context.c |  2 +-
 pango/pangocairo-font.c    |  2 +-
 pango/pangocairo.h         |  2 +-
 pango/pangofc-font.c       |  6 +++---
 pango/pangofc-fontmap.c    | 25 ++++++++++++++++++------
 pango/pangoft2.c           | 13 ++++++-------
 pango/pangoxft-font.c      | 26 ++++++++++++-------------
 tests/test-break.c         | 31 ++++++++++++++++++++++++------
 tests/test-itemize.c       | 32 ++++++++++++++++++++++++-------
 tests/test-layout.c        | 30 +++++++++++++++++++++++------
 utils/meson.build          |  2 +-
 16 files changed, 176 insertions(+), 73 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]