Merge branch 'master' into cff-subset
authorMichiharu Ariza <ariza@adobe.com>
Mon, 1 Oct 2018 17:22:06 +0000 (10:22 -0700)
committerMichiharu Ariza <ariza@adobe.com>
Mon, 1 Oct 2018 17:22:06 +0000 (10:22 -0700)
commit3dd43f0234febd434d89927adf2ee19f0489c5a7
tree74f9aca1a8f1e9c261a3f86061fe25dcd671faac
parentab16b24cc94389ac66a9353327d2a87a7c230ed4
parenteb1e60287732ede6040ce6f7498c10909448d248
Merge branch 'master' into cff-subset
src/hb-ot-font.cc
test/api/Makefile.am