diff options
| author | Derick Rethans <github@derickrethans.nl> | 2017-10-24 14:56:39 +0100 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2017-10-24 14:56:39 +0100 |
| commit | 2ca08a3d66ea6fc6cca5337c5ade757bc86c1934 (patch) | |
| tree | cf1abbba19d3b7558702e8b5dc8037eb6a9307c0 | |
| parent | 0dbbf710e23da52d80eb190d6fb3d2ead4065ba8 (diff) | |
| parent | ca23b0484ce115c905c508a18c822b1279a5a244 (diff) | |
| download | php-git-2ca08a3d66ea6fc6cca5337c5ade757bc86c1934.tar.gz | |
Merge branch 'PHP-7.2'
| -rw-r--r-- | ext/date/lib/timezonemap.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ext/date/lib/timezonemap.h b/ext/date/lib/timezonemap.h index 5859d22f66..d1aa92386f 100644 --- a/ext/date/lib/timezonemap.h +++ b/ext/date/lib/timezonemap.h @@ -446,7 +446,6 @@ { "cst", 0, -21600, "America/Thunder_Bay" }, { "cst", 0, -21600, "America/Winnipeg" }, { "cst", 0, -21600, "Canada/Central" }, - { "cst", 0, -21600, "Canada/East-Saskatchewan" }, { "cst", 0, -21600, "Canada/Saskatchewan" }, { "cst", 0, -21600, "Mexico/BajaSur" }, { "cst", 0, -21600, "Mexico/General" }, @@ -760,7 +759,6 @@ { "mdt", 1, -21600, "America/Shiprock" }, { "mdt", 1, -21600, "America/Swift_Current" }, { "mdt", 1, -21600, "America/Yellowknife" }, - { "mdt", 1, -21600, "Canada/East-Saskatchewan" }, { "mdt", 1, -21600, "Canada/Mountain" }, { "mdt", 1, -21600, "Canada/Saskatchewan" }, { "mdt", 1, -21600, "Mexico/BajaSur" }, @@ -772,6 +770,8 @@ { "mmt", 0, -2670, "Africa/Monrovia" }, { "mmt", 0, 17640, "Indian/Maldives" }, { "mmt", 0, 19172, "Asia/Colombo" }, + { "mmt", 0, 19270, "Asia/Calcutta" }, + { "mmt", 0, 19270, "Asia/Kolkata" }, { "mmt", 0, 28656, "Asia/Makassar" }, { "mmt", 0, 28656, "Asia/Ujung_Pandang" }, { "mmt", 0, 6600, "Europe/Minsk" }, @@ -786,7 +786,6 @@ { "mpt", 1, -21600, "America/Shiprock" }, { "mpt", 1, -21600, "America/Swift_Current" }, { "mpt", 1, -21600, "America/Yellowknife" }, - { "mpt", 1, -21600, "Canada/East-Saskatchewan" }, { "mpt", 1, -21600, "Canada/Mountain" }, { "mpt", 1, -21600, "Canada/Saskatchewan" }, { "msd", 1, 14400, "Europe/Moscow" }, @@ -840,7 +839,6 @@ { "mst", 0, -25200, "America/Swift_Current" }, { "mst", 0, -25200, "America/Tijuana" }, { "mst", 0, -25200, "America/Yellowknife" }, - { "mst", 0, -25200, "Canada/East-Saskatchewan" }, { "mst", 0, -25200, "Canada/Mountain" }, { "mst", 0, -25200, "Canada/Saskatchewan" }, { "mst", 0, -25200, "Mexico/BajaNorte" }, @@ -859,7 +857,6 @@ { "mwt", 1, -21600, "America/Shiprock" }, { "mwt", 1, -21600, "America/Swift_Current" }, { "mwt", 1, -21600, "America/Yellowknife" }, - { "mwt", 1, -21600, "Canada/East-Saskatchewan" }, { "mwt", 1, -21600, "Canada/Mountain" }, { "mwt", 1, -21600, "Canada/Saskatchewan" }, { "nddt", 1, -5400, "America/St_Johns" }, @@ -994,8 +991,8 @@ { "pwt", 1, -25200, "Mexico/BajaNorte" }, { "qmt", 0, -18840, "America/Guayaquil" }, { "rmt", 0, 5794, "Europe/Riga" }, - { "rmt", 0, 23080, "Asia/Rangoon" }, - { "rmt", 0, 23080, "Asia/Yangon" }, + { "rmt", 0, 23087, "Asia/Rangoon" }, + { "rmt", 0, 23087, "Asia/Yangon" }, { "rmt", 0, 2996, "Europe/Rome" }, { "rmt", 0, 2996, "Europe/San_Marino" }, { "rmt", 0, 2996, "Europe/Vatican" }, |