Merge branch 'master' into cff-subset

author Michiharu Ariza <ariza@adobe.com>

Fri, 30 Nov 2018 23:00:52 +0000 (15:00 -0800)

committer Michiharu Ariza <ariza@adobe.com>

Fri, 30 Nov 2018 23:00:52 +0000 (15:00 -0800)
author Michiharu Ariza <ariza@adobe.com>
Fri, 30 Nov 2018 23:00:52 +0000 (15:00 -0800)
committer Michiharu Ariza <ariza@adobe.com>
Fri, 30 Nov 2018 23:00:52 +0000 (15:00 -0800)
diff --cc src/Makefile.sources
Simple merge
diff --cc src/hb-null.hh
Simple merge
diff --cc src/hb-ot-vorg-table.hh
Simple merge
diff --cc src/hb-subset.cc
Simple merge
author	Michiharu Ariza <ariza@adobe.com>
	Fri, 30 Nov 2018 23:00:52 +0000 (15:00 -0800)
committer	Michiharu Ariza <ariza@adobe.com>
	Fri, 30 Nov 2018 23:00:52 +0000 (15:00 -0800)
		1	2
src/Makefile.sources	patch \|	diff1 \|	diff2 \|	blob \| history
src/hb-null.hh	patch \|	diff1 \|	diff2 \|	blob \| history
src/hb-ot-vorg-table.hh	patch \|	diff1 \|	diff2 \|	blob \| history
src/hb-subset.cc	patch \|	diff1 \|	diff2 \|	blob \| history