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/data/locales/ast.txt | |
| 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/data/locales/ast.txt')
| -rw-r--r-- | intl/icu/source/data/locales/ast.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/intl/icu/source/data/locales/ast.txt b/intl/icu/source/data/locales/ast.txt index 38f3adfb5..b40e5883b 100644 --- a/intl/icu/source/data/locales/ast.txt +++ b/intl/icu/source/data/locales/ast.txt @@ -1,4 +1,4 @@ -// © 2016 and later: Unicode, Inc. and others. +// © 2016 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html#License ast{ AuxExemplarCharacters{"[ª à ă â å ä ã ā æ ç è ĕ ê ë ē ì ĭ î ï ī j k º ò ŏ ô ö ø ō œ ù ŭ û ū w ÿ]"} @@ -2288,6 +2288,7 @@ ast{ "Taishō", "e. Shōwa", "Heisei", + "Reiwa", } narrow{ "Taika", @@ -2526,6 +2527,7 @@ ast{ "T", "S", "H", + "R", } wide{ "Taika (645–650)", @@ -2764,6 +2766,7 @@ ast{ "Taishō", "era Shōwa", "Heisei", + "Reiwa", } } intervalFormats{ |