Merge branch 'master' into remove-coretext-96dpi-assumption
authorEbrahim Byagowi <ebrahim@gnu.org>
Tue, 20 Aug 2019 08:29:33 +0000 (12:59 +0430)
committerGitHub <noreply@github.com>
Tue, 20 Aug 2019 08:29:33 +0000 (12:59 +0430)
commit37de38adeae48e1855c2431a39639db873a74554
treeacb46a68b1e962c8dfc92004fe1fe3a06d0ef223
parentf401f85a5a3ec4ab9c28012a0bfe713d7ee96951
parent5ee1e451cfc75dc6ddbc3ae300ba7394a0cd560e
Merge branch 'master' into remove-coretext-96dpi-assumption
src/hb-aat-layout-trak-table.hh
src/hb-coretext.cc
test/shaping/data/in-house/tests/macos.tests