summaryrefslogtreecommitdiffstats
path: root/library/tzdata/Asia/Tokyo
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-08-13 02:54:31 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-08-13 02:54:31 (GMT)
commit7915c17e2675332d054b91b77cee4f801cc8955b (patch)
treef365ec52268a6cb17d50eb8d57fc43ae69fd6731 /library/tzdata/Asia/Tokyo
parent1e779b8343a56ffc0f4f80c8d2016e5fd8371eaf (diff)
parent1c154a30e53f0c04c8f00914637af73dfee1e736 (diff)
downloadtcl-7915c17e2675332d054b91b77cee4f801cc8955b.zip
tcl-7915c17e2675332d054b91b77cee4f801cc8955b.tar.gz
tcl-7915c17e2675332d054b91b77cee4f801cc8955b.tar.bz2
merge 8.5, update changes
Diffstat (limited to 'library/tzdata/Asia/Tokyo')
-rw-r--r--library/tzdata/Asia/Tokyo4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/tzdata/Asia/Tokyo b/library/tzdata/Asia/Tokyo
index 8d1ce11..5bfc75c 100644
--- a/library/tzdata/Asia/Tokyo
+++ b/library/tzdata/Asia/Tokyo
@@ -3,8 +3,8 @@
set TZData(:Asia/Tokyo) {
{-9223372036854775808 33539 0 LMT}
{-2587712400 32400 0 JST}
- {-2335251600 32400 0 CJT}
- {-1009875600 32400 0 JST}
+ {-2335251600 32400 0 JCST}
+ {-1017824400 32400 0 JST}
{-683794800 36000 1 JDT}
{-672393600 32400 0 JST}
{-654764400 36000 1 JDT}