diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-07 01:00:12 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-04-08 22:04:23 +0200 |
| commit | c937ed8af4f3dfef3fd8f8c2a9815376790dd5bf (patch) | |
| tree | 5175aff87e160ae8f32dadc60d3cfd38b73d4fb1 /src/corelib/time/qtimezoneprivate_data_p.h | |
| parent | e0346df1b21cb30b54ae8d4918addc9925fa8479 (diff) | |
| parent | 8823bb8d306d78dd6a2e121a708dc607beff58c8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'src/corelib/time/qtimezoneprivate_data_p.h')
| -rw-r--r-- | src/corelib/time/qtimezoneprivate_data_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h index 822af9c703..6d2bbc83c1 100644 --- a/src/corelib/time/qtimezoneprivate_data_p.h +++ b/src/corelib/time/qtimezoneprivate_data_p.h @@ -115,8 +115,8 @@ struct QUtcData { // GENERATED PART STARTS HERE /* - This part of the file was generated on 2019-10-24 from the - Common Locale Data Repository v36 supplemental/windowsZones.xml file $Revision$ + This part of the file was generated on 2020-02-28 from the + Common Locale Data Repository v36 file supplemental/windowsZones.xml http://www.unicode.org/cldr/ |