projects / platform / upstream / pango.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dff1f2b 08fd5cf)
Merge branch 'master' into harfbuzz-ng-external
authorBehdad Esfahbod <behdad@behdad.org>
Fri, 15 Apr 2011 22:45:24 +0000 (18:45 -0400)
committerBehdad Esfahbod <behdad@behdad.org>
Fri, 15 Apr 2011 22:45:24 +0000 (18:45 -0400)
Conflicts:
pango/opentype/hb-buffer-private.h
pango/opentype/hb-buffer.c
pango/opentype/hb-buffer.h
pango/opentype/hb-open-type-private.hh
pango/opentype/hb-ot-layout-gpos-private.hh

1  2 
configure.in patch | diff1 | diff2 | blob | history
pango/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
diff --cc pango/Makefile.am
Simple merge
Domain: UI Framework / Uncategorized;