diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-11 22:01:18 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-11 22:01:18 (GMT) |
commit | 247684d3712520d32b49fe7dc2f30d22429f7773 (patch) | |
tree | 2dd944eec1cd3e71a4e7c10146c284bf6ad5aec2 | |
parent | 4492d2296e734069fa5fadfd116d67f92e54a6a2 (diff) | |
parent | cbf77a2d9482e2db77cc62df9d0e71d599eb917e (diff) | |
download | tcl-247684d3712520d32b49fe7dc2f30d22429f7773.zip tcl-247684d3712520d32b49fe7dc2f30d22429f7773.tar.gz tcl-247684d3712520d32b49fe7dc2f30d22429f7773.tar.bz2 |
Merge 8.6
-rw-r--r-- | generic/tclDate.c | 2 | ||||
-rw-r--r-- | generic/tclGetDate.y | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/generic/tclDate.c b/generic/tclDate.c index 29b617e..ce7e207 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -2210,6 +2210,8 @@ static const TABLE TimezoneTable[] = { { "pdt", tDAYZONE, HOUR( 8) }, /* Pacific Daylight */ { "yst", tZONE, HOUR( 9) }, /* Yukon Standard */ { "ydt", tDAYZONE, HOUR( 9) }, /* Yukon Daylight */ + { "akst", tZONE, HOUR( 9) }, /* Alaska Standard */ + { "akdt", tDAYZONE, HOUR( 9) }, /* Alaska Daylight */ { "hst", tZONE, HOUR(10) }, /* Hawaii Standard */ { "hdt", tDAYZONE, HOUR(10) }, /* Hawaii Daylight */ { "cat", tZONE, HOUR(10) }, /* Central Alaska */ diff --git a/generic/tclGetDate.y b/generic/tclGetDate.y index c7b47fd..1da7684 100644 --- a/generic/tclGetDate.y +++ b/generic/tclGetDate.y @@ -618,6 +618,8 @@ static const TABLE TimezoneTable[] = { { "pdt", tDAYZONE, HOUR( 8) }, /* Pacific Daylight */ { "yst", tZONE, HOUR( 9) }, /* Yukon Standard */ { "ydt", tDAYZONE, HOUR( 9) }, /* Yukon Daylight */ + { "akst", tZONE, HOUR( 9) }, /* Alaska Standard */ + { "akdt", tDAYZONE, HOUR( 9) }, /* Alaska Daylight */ { "hst", tZONE, HOUR(10) }, /* Hawaii Standard */ { "hdt", tDAYZONE, HOUR(10) }, /* Hawaii Daylight */ { "cat", tZONE, HOUR(10) }, /* Central Alaska */ |