diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-07 01:00:08 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-10-08 10:00:49 +0200 |
| commit | b4da5c6b931fb726fade891448f01c266cb3c115 (patch) | |
| tree | 2f9289340da1470cf317f6670f309968da7f18e8 /src/3rdparty | |
| parent | 05b8ba51550127c85cd2db5cb819b695b56c57ce (diff) | |
| parent | 7146c9075c85cb46cb38b57ded3e12dfa6cbef66 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/corelib/tools/qtimezoneprivate.cpp
Change-Id: Icbb5999d378711ce3786a4fe0aba176a45ac702c
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/zlib/qt_attribution.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/zlib/qt_attribution.json b/src/3rdparty/zlib/qt_attribution.json index ce3fa50f35..ea3a476e7b 100644 --- a/src/3rdparty/zlib/qt_attribution.json +++ b/src/3rdparty/zlib/qt_attribution.json @@ -8,7 +8,7 @@ "Homepage": "http://zlib.net/", "Version": "1.2.11", - "License": "ZLib license", + "License": "zlib License", "LicenseId": "Zlib", "LicenseFile": "LICENSE", "Copyright": "(C) 1995-2017 Jean-loup Gailly and Mark Adler" |