Merge branch 'master' into cff-subset
authorMichiharu Ariza <ariza@adobe.com>
Mon, 8 Oct 2018 22:07:58 +0000 (15:07 -0700)
committerMichiharu Ariza <ariza@adobe.com>
Mon, 8 Oct 2018 22:07:58 +0000 (15:07 -0700)
commita90fd8b9feeee3b02d139f2e7db774766d7855cb
tree56b97b6042ce8f16da0784c3dc19123fb53f2333
parentb51418f596097aa5d1b28fb0a02b613c36bacd8e
parente42cd58c997adafca5517faa9aacf651b90520f5
Merge branch 'master' into cff-subset
src/hb-ot-font.cc