diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2012-08-16 20:51:57 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2012-08-16 21:10:10 -0400 |
| commit | 8168660e5f1906aed2a45d30529058f51473bcef (patch) | |
| tree | 8c5a9172672404c0f85bc78f3ba31a566cb52aba /pango/mini-fribidi | |
| parent | feff5a6e2682048a07a6ba09af83254e290bf394 (diff) | |
| parent | 656d473b52e3edea621c0681d2ba14363f257e84 (diff) | |
| download | pango-8168660e5f1906aed2a45d30529058f51473bcef.tar.gz | |
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
Diffstat (limited to 'pango/mini-fribidi')
| -rw-r--r-- | pango/mini-fribidi/fribidi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pango/mini-fribidi/fribidi.c b/pango/mini-fribidi/fribidi.c index 1da1c1f9..08aebe31 100644 --- a/pango/mini-fribidi/fribidi.c +++ b/pango/mini-fribidi/fribidi.c @@ -49,8 +49,8 @@ struct _TypeLink TypeLink *prev; TypeLink *next; - FriBidiCharType type; FriBidiStrIndex pos, len; + FriBidiCharType type; FriBidiLevel level; }; |