diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-18 16:25:15 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-18 16:26:16 +0200 |
commit | 202296d02aa99afa90581333ab059c050b9c3ade (patch) | |
tree | 6ed8a1289bed1bb06d2703ea77cba5fccd3bdffa /intl/icu/source/i18n/japancal.cpp | |
parent | 1530f48c27fb13d7cbd2708c9f0fcf2dabc6ed6a (diff) | |
parent | ab6242a93b849b0a3c7525b16bc01dd3172fc167 (diff) | |
download | UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar.gz UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar.lz UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar.xz UXP-202296d02aa99afa90581333ab059c050b9c3ade.zip |
Pull Basilisk-release forward.
Diffstat (limited to 'intl/icu/source/i18n/japancal.cpp')
-rw-r--r-- | intl/icu/source/i18n/japancal.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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) |