Merge branch 'master' into cff-subset
authorMichiharu Ariza <ariza@adobe.com>
Sun, 4 Nov 2018 21:25:41 +0000 (13:25 -0800)
committerMichiharu Ariza <ariza@adobe.com>
Sun, 4 Nov 2018 21:25:41 +0000 (13:25 -0800)
commit1682d1bbecaeeddc8a1678a01c57c0e0023bf7c4
tree81dba98e796c5666c87b8b37c298f92c5e22fab6
parentd8fadec098935335e69e46c1101da3f142824638
parentb605db2f65e62ad6727a61481f78015933dbf207
Merge branch 'master' into cff-subset
src/hb-null.hh
src/hb-ot-face.hh
src/hb-subset.cc
test/api/Makefile.am