summaryrefslogtreecommitdiffstats
path: root/intl/tzdata/source/metaZones.txt
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-06-23 15:20:34 +0000
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-06-23 15:20:34 +0000
commita42bed2e9a78715889240ff900e2391bef923285 (patch)
tree202c502b7e964384fb7f0639b756353374b0c045 /intl/tzdata/source/metaZones.txt
parent9a2224a97c7d258fc1f0e5fad30706987880ce22 (diff)
parent276f6583e00edf2a217a3092471ca2aa3aab5a09 (diff)
downloadUXP-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/tzdata/source/metaZones.txt')
-rw-r--r--intl/tzdata/source/metaZones.txt46
1 files changed, 39 insertions, 7 deletions
diff --git a/intl/tzdata/source/metaZones.txt b/intl/tzdata/source/metaZones.txt
index ba47caa8d..d6b002005 100644
--- a/intl/tzdata/source/metaZones.txt
+++ b/intl/tzdata/source/metaZones.txt
@@ -813,7 +813,7 @@ metaZones:table(nofallback){
{
"Europe_Western",
"1985-12-31 23:00",
- "9999-12-31 23:59",
+ "2018-10-28 02:00",
}
}
"Africa:Ceuta"{
@@ -862,7 +862,7 @@ metaZones:table(nofallback){
{
"Europe_Western",
"1976-04-14 01:00",
- "9999-12-31 23:59",
+ "2018-10-28 02:00",
}
}
"Africa:Freetown"{
@@ -1035,6 +1035,11 @@ metaZones:table(nofallback){
{
"Africa_Western",
"2018-01-01 01:00",
+ "2019-01-01 01:00",
+ }
+ {
+ "GMT",
+ "2019-01-01 01:00",
"9999-12-31 23:59",
}
}
@@ -2076,6 +2081,16 @@ metaZones:table(nofallback){
{
"Alaska",
"2015-11-01 10:00",
+ "2018-11-04 10:00",
+ }
+ {
+ "America_Pacific",
+ "2018-11-04 10:00",
+ "2019-01-20 10:00",
+ }
+ {
+ "Alaska",
+ "2019-01-20 10:00",
"9999-12-31 23:59",
}
}
@@ -2559,7 +2574,7 @@ metaZones:table(nofallback){
{
"Casey",
"2016-10-21 16:00",
- "2016-03-10 17:00",
+ "2018-03-10 17:00",
}
{
"Australia_Western",
@@ -3132,11 +3147,11 @@ metaZones:table(nofallback){
{
"Pyongyang",
"2015-08-14 15:00",
- "2018-05-05 08:30",
+ "2018-05-04 15:00",
}
{
"Korea",
- "2018-05-05 08:30",
+ "2018-05-04 15:00",
"9999-12-31 23:59",
}
}
@@ -3152,6 +3167,13 @@ metaZones:table(nofallback){
"9999-12-31 23:59",
}
}
+ "Asia:Qostanay"{
+ {
+ "Kazakhstan_Eastern",
+ "2004-10-30 21:00",
+ "9999-12-31 23:59",
+ }
+ }
"Asia:Qyzylorda"{
{
"Kizilorda",
@@ -3166,6 +3188,11 @@ metaZones:table(nofallback){
{
"Kazakhstan_Eastern",
"2004-10-30 21:00",
+ "2018-12-20 18:00",
+ }
+ {
+ "Kazakhstan_Western",
+ "2018-12-20 18:00",
"9999-12-31 23:59",
}
}
@@ -3992,6 +4019,11 @@ metaZones:table(nofallback){
{
"Moscow",
"1992-03-28 22:00",
+ "2018-10-27 23:00",
+ }
+ {
+ "Volgograd",
+ "2018-10-27 23:00",
"9999-12-31 23:59",
}
}
@@ -4211,11 +4243,11 @@ metaZones:table(nofallback){
{
"Kwajalein",
"1970-01-01 00:00",
- "1993-08-20 12:00",
+ "1993-08-21 12:00",
}
{
"Marshall_Islands",
- "1993-08-20 12:00",
+ "1993-08-21 12:00",
"9999-12-31 23:59",
}
}