summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-10-08 07:05:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-10-08 07:05:19 (GMT)
commit447dd177c9d85086c6d5cf98d3bf00b102b56c7e (patch)
treede073e1ae80132b773f02e04e757b6a1b3fb78b2 /library
parentfa2cb7883beede585b4082ff56dc6cb16872553b (diff)
parent0ded79bd3af336c3181682e86f6ba0db9a9cc11e (diff)
downloadtcl-447dd177c9d85086c6d5cf98d3bf00b102b56c7e.zip
tcl-447dd177c9d85086c6d5cf98d3bf00b102b56c7e.tar.gz
tcl-447dd177c9d85086c6d5cf98d3bf00b102b56c7e.tar.bz2
Merge 8.6
Diffstat (limited to 'library')
-rw-r--r--library/tzdata/Atlantic/Jan_Mayen6
-rw-r--r--library/tzdata/Pacific/Kanton8
2 files changed, 11 insertions, 3 deletions
diff --git a/library/tzdata/Atlantic/Jan_Mayen b/library/tzdata/Atlantic/Jan_Mayen
index 468d819..e592187 100644
--- a/library/tzdata/Atlantic/Jan_Mayen
+++ b/library/tzdata/Atlantic/Jan_Mayen
@@ -1,5 +1,5 @@
# created by tools/tclZIC.tcl - do not edit
-if {![info exists TZData(Europe/Berlin)]} {
- LoadTimeZoneFile Europe/Berlin
+if {![info exists TZData(Europe/Oslo)]} {
+ LoadTimeZoneFile Europe/Oslo
}
-set TZData(:Atlantic/Jan_Mayen) $TZData(:Europe/Berlin)
+set TZData(:Atlantic/Jan_Mayen) $TZData(:Europe/Oslo)
diff --git a/library/tzdata/Pacific/Kanton b/library/tzdata/Pacific/Kanton
new file mode 100644
index 0000000..061c2b5
--- /dev/null
+++ b/library/tzdata/Pacific/Kanton
@@ -0,0 +1,8 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:Pacific/Kanton) {
+ {-9223372036854775808 0 0 -00}
+ {-1020470400 -43200 0 -12}
+ {307627200 -39600 0 -11}
+ {788871600 46800 0 +13}
+}