[pango: 13/13] Merge branch 'wip/baedert/for-master' into 'master'



commit e6b03b9f097552829acd7c54ce222c5dc7eb2b65
Merge: 7abe91c2 1bb4e61c
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jun 10 11:48:52 2020 +0000

    Merge branch 'wip/baedert/for-master' into 'master'
    
    Wip/baedert/for master
    
    See merge request GNOME/pango!194

 pango/pango-attributes-private.h |  11 +-
 pango/pango-attributes.c         | 671 +++++++++++++++++----------------------
 pango/pango-context.c            |   3 +-
 pango/pango-layout.c             |   6 +
 pango/pango-ot-info.c            |   7 +-
 pango/pango-tabs.c               |   3 +-
 pango/pangocairo-render.c        |   2 +-
 pango/pangofc-fontmap.c          |   2 +-
 tests/testattributes.c           |  71 +++++
 9 files changed, 391 insertions(+), 385 deletions(-)
---


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