diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-11-10 13:01:07 +1000 |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2009-11-10 13:01:07 +1000 |
| commit | 8df98549a4d84b5877e50318140c2041e17632fb (patch) | |
| tree | 0c55d5ef4d8380ec45c6457a40b033dc45cbd579 /src/3rdparty/harfbuzz/src/harfbuzz-shaper.h | |
| parent | f55c317e377aaf0b3e24904e88dc1c4a6e15a20a (diff) | |
| parent | 9a6de1fa0db0da8c4fa5eb904ef6d78cc619e332 (diff) | |
Merge branch '4.6' of ../qt into 4.6
Diffstat (limited to 'src/3rdparty/harfbuzz/src/harfbuzz-shaper.h')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-shaper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h index d2357f4301..f7c7714743 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h @@ -62,6 +62,7 @@ typedef enum { HB_Script_Ogham, HB_Script_Runic, HB_Script_Khmer, + HB_Script_Nko, HB_Script_Inherited, HB_ScriptCount = HB_Script_Inherited /* @@ -102,7 +103,6 @@ typedef enum { HB_Script_Cuneiform = Common, HB_Script_Phoenician = Common, HB_Script_PhagsPa = Common, - HB_Script_Nko = Common */ } HB_Script; |