From: Behdad Esfahbod Date: Fri, 15 Apr 2011 22:45:24 +0000 (-0400) Subject: Merge branch 'master' into harfbuzz-ng-external X-Git-Tag: 1.31.0~19^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c;p=platform%2Fupstream%2Fpango.git Merge branch 'master' into harfbuzz-ng-external 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 --- 9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c