diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-23 22:12:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 22:12:54 +0100 |
| commit | 7df08a8b63c8fc861a5e927eabf2405e1a2a01e1 (patch) | |
| tree | 495ff2934465b02b01fc2ff694687344c909bf62 /src/3rdparty/harfbuzz/tests/shaping | |
| parent | 06e4b1cff4c469d2fc3afbfe7a6b1954fedc90ff (diff) | |
| parent | c608ec825410a9287f544a2ae3ce8154424e767d (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/3rdparty/harfbuzz/tests/shaping')
| -rw-r--r-- | src/3rdparty/harfbuzz/tests/shaping/harfbuzz-qt.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz/tests/shaping/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/harfbuzz/tests/shaping/harfbuzz-qt.cpp b/src/3rdparty/harfbuzz/tests/shaping/harfbuzz-qt.cpp index 7b6df736e8..7c73167f5d 100644 --- a/src/3rdparty/harfbuzz/tests/shaping/harfbuzz-qt.cpp +++ b/src/3rdparty/harfbuzz/tests/shaping/harfbuzz-qt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/tests/shaping/main.cpp b/src/3rdparty/harfbuzz/tests/shaping/main.cpp index 302d0a00e8..bde8a49b4d 100644 --- a/src/3rdparty/harfbuzz/tests/shaping/main.cpp +++ b/src/3rdparty/harfbuzz/tests/shaping/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * This is part of HarfBuzz, an OpenType Layout engine library. * |