Merge branch 'master' of https://github.com/harfbuzz/harfbuzz into drophints
authorRod Sheeter <rsheeter@google.com>
Sat, 24 Feb 2018 01:53:26 +0000 (17:53 -0800)
committerRod Sheeter <rsheeter@google.com>
Sat, 24 Feb 2018 01:53:26 +0000 (17:53 -0800)
commitd78393b5547135b8db0356b0ec14d5ed0d334768
tree0ce5f2becdf2340185a456e178b7a3e2810f700c
parent1454d82a9d3d9a47901b3d92ff7f2c05c596c0d5
parent83af6c237f2bfd66af76a8647a62b3d1ab996744
Merge branch 'master' of https://github.com/harfbuzz/harfbuzz into drophints
src/hb-subset-glyf.cc
src/hb-subset-plan.cc
src/hb-subset.cc
util/options.cc
util/options.hh