diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 18:47:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-01 09:10:26 +0200 |
| commit | 0e6ee136c91432d4ceeeda64e5a5fa88231398d4 (patch) | |
| tree | 6060e002af2900007895f6efa757989dd4c190c9 /tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt | |
| parent | 418869d9158ea5cd998ba30778b0b7173b48161b (diff) | |
| parent | 17294c5e4d15d5776f6e414b03671a4a9ed4993d (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/testlib/qtestblacklist.cpp
src/widgets/accessible/qaccessiblewidgets.cpp
Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c
Diffstat (limited to 'tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt')
| -rw-r--r-- | tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt b/tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt index 88a98e7127..d39f2c760a 100644 --- a/tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt +++ b/tests/auto/corelib/tools/qtextboundaryfinder/data/GraphemeBreakTest.txt @@ -1,5 +1,5 @@ -# GraphemeBreakTest-6.3.0.txt -# Date: 2012-12-20, 22:18:29 GMT [MD] +# GraphemeBreakTest-7.0.0.txt +# Date: 2013-11-27, 09:54:39 GMT [MD] # # Unicode Character Database # Copyright (c) 1991-2013 Unicode, Inc. |