diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-23 15:20:34 +0000 |
| commit | a42bed2e9a78715889240ff900e2391bef923285 (patch) | |
| tree | 202c502b7e964384fb7f0639b756353374b0c045 /intl/icu/source/i18n | |
| parent | 9a2224a97c7d258fc1f0e5fad30706987880ce22 (diff) | |
| parent | 276f6583e00edf2a217a3092471ca2aa3aab5a09 (diff) | |
| download | UXP-a42bed2e9a78715889240ff900e2391bef923285.tar UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.gz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.lz UXP-a42bed2e9a78715889240ff900e2391bef923285.tar.xz UXP-a42bed2e9a78715889240ff900e2391bef923285.zip | |
Merge branch 'master' into remove-unboxed
# Conflicts:
# js/src/jit/BaselineIC.cpp
# js/src/jsarray.cpp
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; } |