summaryrefslogtreecommitdiffstats
path: root/src/corelib/text/qt_attribution.json
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-27 01:00:50 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-10-27 01:00:50 +0200
commit8bcecd86fac60475a7236787b4b89460fa89d612 (patch)
tree947fc6b3b097c615e7cb2611c2df9f2fabdaac1c /src/corelib/text/qt_attribution.json
parent7b3bdcbfe8a920c4c156e91324eb0b374533d42c (diff)
parentdd0cd711708f65c429f807f42456bff14404f9c0 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/corelib/text/qt_attribution.json')
-rw-r--r--src/corelib/text/qt_attribution.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qt_attribution.json b/src/corelib/text/qt_attribution.json
index f91742d421..a488f1341e 100644
--- a/src/corelib/text/qt_attribution.json
+++ b/src/corelib/text/qt_attribution.json
@@ -29,11 +29,11 @@
world's languages, with the largest and most extensive standard repository of locale data
available.",
"Homepage": "http://cldr.unicode.org/",
- "Version": "v35.1",
+ "Version": "v36",
"License": "// as specified in https://spdx.org/licenses/Unicode-DFS-2016.html",
"License": "Unicode License Agreement - Data Files and Software (2016)",
"LicenseId": "Unicode-DFS-2016",
"LicenseFile": "UNICODE_LICENSE.txt",
- "Copyright": "Copyright (C) 1991-2018 Unicode, Inc."
+ "Copyright": "Copyright (C) 1991-2019 Unicode, Inc."
}
]