Merge branch 'master' into cff-subset
authorMichiharu Ariza <ariza@adobe.com>
Fri, 7 Sep 2018 17:50:55 +0000 (10:50 -0700)
committerMichiharu Ariza <ariza@adobe.com>
Fri, 7 Sep 2018 17:50:55 +0000 (10:50 -0700)
commit1e88b1755c37eaa171c08f7bedb93f110238c80f
tree9d44f61b4b66698f2b59c00e45398bcb64c8b1f5
parent22b88632d5bd3676642b0a1d93f27e47438c140b
parentebe67137ab3559c2c6aaf53442ca223cb34df5af
Merge branch 'master' into cff-subset
src/hb-ot-layout-common.hh
src/hb-subset.cc