[amalgam] Use it in cmake port and fix conflicts (#1812)
authorEbrahim Byagowi <ebrahim@gnu.org>
Fri, 5 Jul 2019 14:16:41 +0000 (18:46 +0430)
committerGitHub <noreply@github.com>
Fri, 5 Jul 2019 14:16:41 +0000 (18:46 +0430)
commit9fea6b4dd41bfe2b85f788523162658a7ab9bd49
tree2691e67dfaf41ffafd0646bc95be3de4ab1c6c71
parentb240d701fd98efa59a7f772ff39654fc95b8fc8f
[amalgam] Use it in cmake port and fix conflicts (#1812)
.circleci/config.yml
CMakeLists.txt
src/Makefile.am
src/hb-cff-interp-common.hh
src/hb-cff-interp-cs-common.hh
src/hb-coretext.cc
src/hb-directwrite.cc
src/hb-ft.cc