aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-06-13 18:04:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-06-12 05:34:11 +0000
commite04e5980f1a4ae5efec53fd9e2e3ba1c15ea0aee (patch)
tree30c52b53a2cdfbc44dc456568153a5aa8095ee68
parent6a29d748029fd83f526f695cccdf00afed570231 (diff)
parent45546f21553691752ec7ace625dda78e5604cb89 (diff)
downloadicu4c-e04e5980f1a4ae5efec53fd9e2e3ba1c15ea0aee.tar.gz
Merge "Upgrade icu4c to tzdata2014e."
-rw-r--r--data/misc/zoneinfo64.txt26
-rw-r--r--stubdata/icudt53l.datbin18716832 -> 18716832 bytes
2 files changed, 13 insertions, 13 deletions
diff --git a/data/misc/zoneinfo64.txt b/data/misc/zoneinfo64.txt
index 228be1d0..40a26b0d 100644
--- a/data/misc/zoneinfo64.txt
+++ b/data/misc/zoneinfo64.txt
@@ -3,9 +3,9 @@
// Corporation and others. All Rights Reserved.
//---------------------------------------------------------
// Build tool: tz2icu
-// Build date: Wed May 28 20:33:21 2014
+// Build date: Fri Jun 13 10:52:14 2014
// Olson source: ftp://elsie.nci.nih.gov/pub/
-// Olson version: 2014d
+// Olson version: 2014e
// ICU version: 53.1.0.1
//---------------------------------------------------------
// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<
@@ -13,7 +13,7 @@
//---------------------------------------------------------
zoneinfo64:table(nofallback) {
- TZVersion { "2014d" }
+ TZVersion { "2014e" }
Zones:array {
/* ACT */ :int { 345 } //Z#0
/* AET */ :int { 357 } //Z#1
@@ -89,7 +89,7 @@ zoneinfo64:table(nofallback) {
} //Z#17
/* Africa/Cairo */ :table {
transPre32:intvector { -1, 2109558187 }
- trans:intvector { -929844000, -923108400, -906170400, -892868400, -875844000, -857790000, -844308000, -825822000, -812685600, -794199600, -779853600, -762663600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -71107200, -52707600, -39484800, -21171600, -7948800, 10364400, 23587200, 41900400, 55123200, 73522800, 86745600, 105058800, 118281600, 136594800, 149817600, 168130800, 181353600, 199753200, 212976000, 231289200, 244512000, 262825200, 276048000, 294361200, 307584000, 325983600, 339206400, 357519600, 370742400, 396399600, 402278400, 426812400, 433814400, 452214000, 465436800, 483750000, 496972800, 515286000, 528508800, 546822000, 560044800, 578444400, 591667200, 610412400, 623203200, 641516400, 654739200, 673052400, 686275200, 704674800, 717897600, 736210800, 749433600, 767746800, 780969600, 799020000, 812322000, 830469600, 843771600, 861919200, 875221200, 893368800, 906670800, 925423200, 938725200, 956872800, 970174800, 988322400, 1001624400, 1019772000, 1033074000, 1051221600, 1064523600, 1083276000, 1096578000, 1114725600, 1128027600, 1146175200, 1158872400, 1177624800, 1189112400, 1209074400, 1219957200, 1240524000, 1250802000, 1272578400, 1281474000, 1284069600, 1285880400, 1400191200, 1403992800, 1406584800, 1411678800, 1429826400, 1434578400, 1437170400, 1443128400, 1461880800, 1465250400, 1467842400, 1475182800, 1493330400, 1495836000, 1498428000, 1506632400, 1524780000, 1526421600, 1529013600, 1538082000, 1556229600, 1557093600, 1559685600, 1569531600, 1590271200, 1600981200, 1620856800, 1633035600, 1651528800, 1664485200, 1682632800, 1695934800 }
+ trans:intvector { -929844000, -923108400, -906170400, -892868400, -875844000, -857790000, -844308000, -825822000, -812685600, -794199600, -779853600, -762663600, -399088800, -386650800, -368330400, -355114800, -336790800, -323654400, -305168400, -292032000, -273632400, -260496000, -242096400, -228960000, -210560400, -197424000, -178938000, -165801600, -147402000, -134265600, -115866000, -102643200, -84330000, -71107200, -52707600, -39484800, -21171600, -7948800, 10364400, 23587200, 41900400, 55123200, 73522800, 86745600, 105058800, 118281600, 136594800, 149817600, 168130800, 181353600, 199753200, 212976000, 231289200, 244512000, 262825200, 276048000, 294361200, 307584000, 325983600, 339206400, 357519600, 370742400, 396399600, 402278400, 426812400, 433814400, 452214000, 465436800, 483750000, 496972800, 515286000, 528508800, 546822000, 560044800, 578444400, 591667200, 610412400, 623203200, 641516400, 654739200, 673052400, 686275200, 704674800, 717897600, 736210800, 749433600, 767746800, 780969600, 799020000, 812322000, 830469600, 843771600, 861919200, 875221200, 893368800, 906670800, 925423200, 938725200, 956872800, 970174800, 988322400, 1001624400, 1019772000, 1033074000, 1051221600, 1064523600, 1083276000, 1096578000, 1114725600, 1128027600, 1146175200, 1158872400, 1177624800, 1189112400, 1209074400, 1219957200, 1240524000, 1250802000, 1272578400, 1281474000, 1284069600, 1285880400, 1400191200, 1403816400, 1406844000, 1411678800, 1429826400, 1434056400, 1437688800, 1443128400, 1461880800, 1464901200, 1467928800, 1475182800, 1493330400, 1495746000, 1498773600, 1506632400, 1524780000, 1525986000, 1529013600, 1538082000, 1556229600, 1556830800, 1559858400, 1569531600, 1590703200, 1600981200, 1620943200, 1633035600, 1651788000, 1664485200, 1682632800, 1695934800 }
typeOffsets:intvector { 7509, 0, 7200, 0, 7200, 3600 }
typeMap:bin { "0102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "Egypt" }
@@ -98,13 +98,13 @@ zoneinfo64:table(nofallback) {
links:intvector { 3, 18, 391 }
} //Z#18
/* Africa/Casablanca */ :table {
- trans:intvector { -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1404007200, 1406599200, 1414288800, 1427594400, 1434592800, 1437184800, 1445738400, 1459044000, 1465264800, 1467856800, 1477792800, 1490493600, 1495850400, 1498442400, 1509242400, 1521943200, 1526436000, 1529028000, 1540692000, 1553997600, 1557108000, 1559700000, 1572141600, 1585447200, 1587693600, 1590285600, 1603591200, 1616896800, 1618279200, 1620871200, 1635645600, 1648346400, 1648951200, 1651543200, 1667095200, 1682128800, 1698544800, 1712714400, 1729994400, 1743386400, 1761444000, 1774749600, 1792893600, 1806199200, 1824948000, 1837648800, 1856397600, 1869098400, 1887847200, 1901152800, 1919296800, 1932602400, 1950746400, 1964052000, 1982800800, 1995501600, 2014250400, 2026951200, 2045700000, 2058400800, 2077149600, 2090455200, 2108167200, 2121904800, 2138839200 }
- transPost32:intvector { 0, -2141612896, 0, -2125542496, 0, -2122950496, 0, -2122864096, 0, -2110163296, 0, -2091414496 }
+ trans:intvector { -1773012580, -956361600, -950490000, -942019200, -761187600, -617241600, -605149200, -81432000, -71110800, 141264000, 147222000, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 448243200, 504918000, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434160800, 1437184800, 1445738400, 1459044000, 1465005600, 1468029600, 1477792800, 1490493600, 1495245600, 1498874400, 1509242400, 1521943200, 1526090400, 1529114400, 1540692000, 1553997600, 1556935200, 1559959200, 1572141600, 1585447200, 1587175200, 1590804000, 1603591200, 1616896800, 1618020000, 1621044000, 1635645600, 1648346400, 1648864800, 1651888800, 1667095200, 1682128800, 1698544800, 1712973600, 1729994400, 1743818400, 1761444000, 1774749600, 1792893600, 1806199200, 1824948000, 1837648800, 1856397600, 1869098400, 1887847200, 1901152800, 1919296800, 1932602400, 1950746400, 1964052000, 1982800800, 1995501600, 2014250400, 2026951200, 2045700000, 2058400800, 2077063200, 2090455200, 2107908000, 2121904800, 2138752800 }
+ transPost32:intvector { 0, -2141612896, 0, -2122864096 }
typeOffsets:intvector { -1820, 0, 0, 0, 0, 3600, 3600, 0 }
- typeMap:bin { "0102010201020102010201020102010201030102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
+ typeMap:bin { "01020102010201020102010201020102010301020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" }
finalRule { "Morocco" }
finalRaw:int { 0 }
- finalYear:int { 2040 }
+ finalYear:int { 2039 }
} //Z#19
/* Africa/Ceuta */ :table {
transPre32:intvector { -1, 2117515772 }
@@ -141,13 +141,13 @@ zoneinfo64:table(nofallback) {
typeMap:bin { "01" }
} //Z#25
/* Africa/El_Aaiun */ :table {
- trans:intvector { -1136070432, 198291600, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1404007200, 1406599200, 1414288800, 1427594400, 1434592800, 1437184800, 1445738400, 1459044000, 1465264800, 1467856800, 1477792800, 1490493600, 1495850400, 1498442400, 1509242400, 1521943200, 1526436000, 1529028000, 1540692000, 1553997600, 1557108000, 1559700000, 1572141600, 1585447200, 1587693600, 1590285600, 1603591200, 1616896800, 1618279200, 1620871200, 1635645600, 1648346400, 1648951200, 1651543200, 1667095200, 1682128800, 1698544800, 1712714400, 1729994400, 1743386400, 1761444000, 1774749600, 1792893600, 1806199200, 1824948000, 1837648800, 1856397600, 1869098400, 1887847200, 1901152800, 1919296800, 1932602400, 1950746400, 1964052000, 1982800800, 1995501600, 2014250400, 2026951200, 2045700000, 2058400800, 2077149600, 2090455200, 2108167200, 2121904800, 2138839200 }
- transPost32:intvector { 0, -2141612896, 0, -2125542496, 0, -2122950496, 0, -2122864096, 0, -2110163296, 0, -2091414496 }
+ trans:intvector { -1136070432, 198291600, 199756800, 207702000, 231292800, 244249200, 265507200, 271033200, 1212278400, 1220223600, 1243814400, 1250809200, 1272758400, 1281222000, 1301788800, 1312066800, 1335664800, 1342749600, 1345428000, 1348970400, 1367114400, 1373162400, 1376100000, 1382839200, 1396144800, 1403920800, 1406944800, 1414288800, 1427594400, 1434160800, 1437184800, 1445738400, 1459044000, 1465005600, 1468029600, 1477792800, 1490493600, 1495245600, 1498874400, 1509242400, 1521943200, 1526090400, 1529114400, 1540692000, 1553997600, 1556935200, 1559959200, 1572141600, 1585447200, 1587175200, 1590804000, 1603591200, 1616896800, 1618020000, 1621044000, 1635645600, 1648346400, 1648864800, 1651888800, 1667095200, 1682128800, 1698544800, 1712973600, 1729994400, 1743818400, 1761444000, 1774749600, 1792893600, 1806199200, 1824948000, 1837648800, 1856397600, 1869098400, 1887847200, 1901152800, 1919296800, 1932602400, 1950746400, 1964052000, 1982800800, 1995501600, 2014250400, 2026951200, 2045700000, 2058400800, 2077063200, 2090455200, 2107908000, 2121904800, 2138752800 }
+ transPost32:intvector { 0, -2141612896, 0, -2122864096 }
typeOffsets:intvector { -3168, 0, -3600, 0, 0, 0, 0, 3600 }
- typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" }
+ typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" }
finalRule { "Morocco" }
finalRaw:int { 0 }
- finalYear:int { 2040 }
+ finalYear:int { 2039 }
} //Z#26
/* Africa/Freetown */ :table {
trans:intvector { -1785712020, -1091487600, -1080949200, -1059865200, -1049326800, -1028329200, -1017790800, -996793200, -986254800, -965257200, -954718800, -933634800, -923096400, -902098800, -891560400, -870562800, -860024400, -410223600, -397180800, -389235600, -365644800, -357699600, -334108800, -326163600, -302486400, -294541200, -270950400, -263005200, -239414400, -231469200 }
@@ -3267,7 +3267,7 @@ zoneinfo64:table(nofallback) {
2, -31, -1, 3600, 2, 9, -31, -1, 3600, 2, 3600
} //_#13
Egypt:intvector {
- 3, -30, -6, 0, 1, 8, -30, -5, 82800, 1, 3600
+ 3, -30, -6, 0, 1, 8, -30, -5, 86400, 0, 3600
} //_#14
Fiji:intvector {
9, 21, -1, 7200, 0, 0, 18, -1, 7200, 0, 3600
diff --git a/stubdata/icudt53l.dat b/stubdata/icudt53l.dat
index db17003b..44c3e15f 100644
--- a/stubdata/icudt53l.dat
+++ b/stubdata/icudt53l.dat
Binary files differ