Merge branch 'master' into cff-subset
authorMichiharu Ariza <ariza@adobe.com>
Tue, 6 Nov 2018 17:57:17 +0000 (09:57 -0800)
committerMichiharu Ariza <ariza@adobe.com>
Tue, 6 Nov 2018 17:57:17 +0000 (09:57 -0800)
commit43ee0e4d006ce7b4ade4483f2c8ec3d39723fc94
tree158720a009cfb416fb199ccc500bb2cea4b45908
parentec6817c1bd82a60b84cb868e4d7ff4c65cb80ccc
parentbfafe208da11817b5ebf3751f02af2dcdf57bd19
Merge branch 'master' into cff-subset
src/hb-null.hh
src/hb-ot-face.cc
src/hb-ot-face.hh
src/hb-ot-font.cc
test/api/Makefile.am
util/options.cc
util/options.hh