Merge branch 'master' into cff-subset
authorMichiharu Ariza <ariza@adobe.com>
Thu, 1 Nov 2018 23:13:56 +0000 (16:13 -0700)
committerMichiharu Ariza <ariza@adobe.com>
Thu, 1 Nov 2018 23:13:56 +0000 (16:13 -0700)
commite600e5440b3b77294df47fae947758137ea02501
treef3fe5e9b0b33915e0cfcf6657ec98038295ba6fe
parent82248b9287e7b208c304e761393b745604a51c6e
parentde96e5c81c7f473520df93052ecea162baa5a350
Merge branch 'master' into cff-subset
12 files changed:
src/Makefile.sources
src/hb-null.hh
src/hb-ot-face.cc
src/hb-ot-face.hh
src/hb-ot-font.cc
src/hb-ot-layout-common.hh
src/hb-subset-input.hh
src/hb-subset-plan.cc
src/hb-subset-plan.hh
src/hb-subset.cc
test/api/Makefile.am
util/options.hh