Merge branch 'harfbuzz-ng-external'
authorBehdad Esfahbod <behdad@behdad.org>
Fri, 17 Aug 2012 00:51:57 +0000 (20:51 -0400)
committerBehdad Esfahbod <behdad@behdad.org>
Fri, 17 Aug 2012 01:10:10 +0000 (21:10 -0400)
commit8168660e5f1906aed2a45d30529058f51473bcef
tree8c5a9172672404c0f85bc78f3ba31a566cb52aba
parentfeff5a6e2682048a07a6ba09af83254e290bf394
parent656d473b52e3edea621c0681d2ba14363f257e84
Merge branch 'harfbuzz-ng-external'

Conflicts:
configure.in
docs/tmpl/text-attributes.sgml
modules/arabic/arabic-ot.c
modules/indic/indic-ot.c
pango/opentype/Makefile.am
pango/opentype/hb-blob.c
pango/opentype/hb-buffer-private.h
pango/opentype/hb-common.h
pango/opentype/hb-ot-layout-gsubgpos-private.hh
pango/opentype/hb-private.h
pango/pango-ot-info.c
12 files changed:
build/win32/vs10/pangoft2.vcxproj.filtersin
build/win32/vs10/pangoft2.vcxprojin
build/win32/vs9/pangoft2.vcprojin
configure.in
docs/tmpl/atsui-fonts.sgml
docs/tmpl/fonts.sgml
docs/tmpl/glyphs.sgml
docs/tmpl/layout.sgml
docs/tmpl/main.sgml
docs/tmpl/text-attributes.sgml
pango/Makefile.am
pango/pango-ot-info.c