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)
1  2 
src/hb-ot-font.cc
test/api/Makefile.am

Simple merge
Simple merge