Merge branch 'master' into docs-gtkdoc-colormath
authorn8willis <n8willis@users.noreply.github.com>
Sat, 11 May 2019 19:16:57 +0000 (20:16 +0100)
committerGitHub <noreply@github.com>
Sat, 11 May 2019 19:16:57 +0000 (20:16 +0100)
commit1a850abd66999707b6f4795050e748fc879b92ef
tree0e9b4765ed00746675f9f9c360ee58b8b8050ba0
parent8a544171d15bb36c15ca7bf679643b2b14f94b45
parenta6048e4cd013987ecb846e0683a7cf6f0caa65f9
Merge branch 'master' into docs-gtkdoc-colormath
src/hb-ot-color.cc
src/hb-ot-color.h
src/hb-ot-math.cc