diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2010-09-21 15:47:17 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2010-09-21 15:49:07 -0400 |
| commit | 64ada662476f5b5506a9a455f4c39242ab51ff38 (patch) | |
| tree | e823ef001fb95198ba0fea2944db8334daef4942 /pangowin32-uninstalled.pc.in | |
| parent | e008ca8f198965b55fc4ef297b4d31902b5afc36 (diff) | |
| parent | 254f42980e272f0560b28d466c2b65a1748b1132 (diff) | |
| download | pango-64ada662476f5b5506a9a455f4c39242ab51ff38.tar.gz | |
Merge branch 'master' into harfbuzz-ng-external
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
Diffstat (limited to 'pangowin32-uninstalled.pc.in')
0 files changed, 0 insertions, 0 deletions