diff options
| author | Moonchild <git-repo@palemoon.org> | 2019-06-15 21:21:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-15 21:21:52 +0000 |
| commit | 24864f94219fb549d0c183569c6b51fce74bebd2 (patch) | |
| tree | 8397ce1168c22467ce583ac7e60d279648fb4d57 /intl/icu/source/i18n | |
| parent | c9edf588ed6d9b53038125c6d79c466b398e2da4 (diff) | |
| parent | b17a1f211efb85ddb36abfa769aac3a4292d17ee (diff) | |
| download | UXP-24864f94219fb549d0c183569c6b51fce74bebd2.tar UXP-24864f94219fb549d0c183569c6b51fce74bebd2.tar.gz UXP-24864f94219fb549d0c183569c6b51fce74bebd2.tar.lz UXP-24864f94219fb549d0c183569c6b51fce74bebd2.tar.xz UXP-24864f94219fb549d0c183569c6b51fce74bebd2.zip | |
Merge pull request #1136 from MoonchildProductions/Update_ICU
Update ICU
Diffstat (limited to 'intl/icu/source/i18n')
| -rw-r--r-- | intl/icu/source/i18n/i18n.vcxproj | 2 | ||||
| -rw-r--r-- | intl/icu/source/i18n/i18n.vcxproj.filters | 2 | ||||
| -rw-r--r-- | intl/icu/source/i18n/japancal.cpp | 3 | ||||
| -rw-r--r-- | intl/icu/source/i18n/zonemeta.cpp | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/intl/icu/source/i18n/i18n.vcxproj b/intl/icu/source/i18n/i18n.vcxproj index 869d3a951..eecf1ab12 100644 --- a/intl/icu/source/i18n/i18n.vcxproj +++ b/intl/icu/source/i18n/i18n.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> diff --git a/intl/icu/source/i18n/i18n.vcxproj.filters b/intl/icu/source/i18n/i18n.vcxproj.filters index 57bf52f28..af1511ecb 100644 --- a/intl/icu/source/i18n/i18n.vcxproj.filters +++ b/intl/icu/source/i18n/i18n.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="collation"> diff --git a/intl/icu/source/i18n/japancal.cpp b/intl/icu/source/i18n/japancal.cpp index 93ab8008b..e49e20b94 100644 --- a/intl/icu/source/i18n/japancal.cpp +++ b/intl/icu/source/i18n/japancal.cpp @@ -276,7 +276,8 @@ static const struct { { 1868, 9, 8 }, // Meiji 232 { 1912, 7, 30 }, // Taisho 233 { 1926, 12, 25 }, // Showa 234 - { 1989, 1, 8 } // Heisei 235 + { 1989, 1, 8 }, // Heisei 235 + { 2019, 5, 1 } // Reiwa 236 }; #define kEraCount UPRV_LENGTHOF(kEraInfo) diff --git a/intl/icu/source/i18n/zonemeta.cpp b/intl/icu/source/i18n/zonemeta.cpp index fdf333c37..dd3bf202f 100644 --- a/intl/icu/source/i18n/zonemeta.cpp +++ b/intl/icu/source/i18n/zonemeta.cpp @@ -683,7 +683,6 @@ ZoneMeta::createMetazoneMappings(const UnicodeString &tzid) { mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status); if (U_FAILURE(status)) { delete mzMappings; - deleteOlsonToMetaMappingEntry(entry); uprv_free(entry); break; } |