Merge branch 'master' into cff-subset
authorMichiharu Ariza <ariza@adobe.com>
Mon, 17 Sep 2018 20:07:29 +0000 (13:07 -0700)
committerMichiharu Ariza <ariza@adobe.com>
Mon, 17 Sep 2018 20:07:29 +0000 (13:07 -0700)
commitd050ab8d3e73debfb414fc8c9426180459150b61
tree4cabfacddae79738992acff855504a9fa2f8ba96
parentf0a4e0c2ca5ee0225765590384216d5d5367de7e
parent388ab91642734e1ba0d7a4a4f29a17b15f1b249d
Merge branch 'master' into cff-subset
src/hb-null.hh
src/hb-ot-layout-common.hh