From: Michiharu Ariza <ariza@adobe.com>
Date: Thu, 11 Oct 2018 01:36:35 +0000 (-0700)
Subject: Merge branch 'master' into cff-subset
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5aa5dbb1158a5dfba29f7b119df9b4b319e8489;p=platform%2Fupstream%2FlibHarfBuzzSharp.git

Merge branch 'master' into cff-subset
---

b5aa5dbb1158a5dfba29f7b119df9b4b319e8489
diff --cc test/api/Makefile.am
index 871bd3e,3ff7f5a..03cf815
--- a/test/api/Makefile.am
+++ b/test/api/Makefile.am
@@@ -76,11 -72,9 +76,10 @@@ endi
  TEST_PROGS += \
  	test-ot-color \
  	test-ot-tag \
 +	test-ot-extents-cff \
  	$(NULL)
  
+ 
  if HAVE_PTHREAD
  if HAVE_FREETYPE
  TEST_PROGS += test-multithread