diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 12:37:34 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 12:37:34 +0200 |
commit | cb3348dec91c535133cf4f4016649685c6de278c (patch) | |
tree | 235de2e22ce524bb279f4ecf12abe964d59ff1f1 /src/3rdparty | |
parent | 06e27c2a52a4bd98bc102de0875df9918166d130 (diff) | |
parent | 9a747cb5b7866d440211aa1dc4e07dd4ff914c2c (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: If1abbe7810ea43ae750db91066f9f579c79b2289
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/harfbuzz-ng/src/config.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz-ng/src/config.h b/src/3rdparty/harfbuzz-ng/src/config.h index cb68ab0e5b..9abb5df7f1 100644 --- a/src/3rdparty/harfbuzz-ng/src/config.h +++ b/src/3rdparty/harfbuzz-ng/src/config.h @@ -4,7 +4,6 @@ #define HAVE_OT #define HAVE_ATEXIT -#define HB_NO_MT #define HB_NO_UNICODE_FUNCS #define HB_DISABLE_DEPRECATED |