-
Behdad Esfahbod authored
Conflicts: pango/Makefile.am pango/pango-ot-buffer.c pango/pango-ot-info.c Removed: pango/opentype/Makefile.am pango/opentype/hb-blob.c pango/opentype/hb-open-file-private.hh pango/opentype/hb-open-type-private.hh pango/opentype/hb-ot-layout-common-private.hh pango/opentype/hb-ot-layout-gdef-private.hh pango/opentype/hb-ot-layout-gpos-private.hh pango/opentype/hb-ot-layout-gsub-private.hh pango/opentype/hb-ot-layout-gsubgpos-private.hh pango/opentype/hb-ot-layout.cc pango/opentype/hb-ot-layout.h pango/opentype/hb-private.h
64ada662