summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-12-05 11:18:10 -0500
committerRuss Cox <rsc@golang.org>2014-12-05 11:18:10 -0500
commit6d3ba1914e289ed223f7bb69f34604c0e2ae5384 (patch)
tree3781a05c976360f88b736c71316dadc789e02062 /lib
parentd39e7f8f9d8d330acbcfeba7e8e254b131b05f39 (diff)
parent3ebebda3a7495402239db4369d59d73749c1bfa2 (diff)
downloadgo-6d3ba1914e289ed223f7bb69f34604c0e2ae5384.tar.gz
[dev.cc] all: merge default (8d42099cdc23) into dev.ccdev.cc
TBR=austin CC=golang-codereviews https://codereview.appspot.com/178700044
Diffstat (limited to 'lib')
-rwxr-xr-xlib/time/update.bash4
-rw-r--r--lib/time/zoneinfo.zipbin358933 -> 360713 bytes
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/time/update.bash b/lib/time/update.bash
index 8e1662afd..caa8450fa 100755
--- a/lib/time/update.bash
+++ b/lib/time/update.bash
@@ -7,8 +7,8 @@
# downloaded from the ICANN/IANA distribution.
# Versions to use.
-CODE=2014d
-DATA=2014d
+CODE=2014j
+DATA=2014j
set -e
rm -rf work
diff --git a/lib/time/zoneinfo.zip b/lib/time/zoneinfo.zip
index e0d3afe07..425d7c98f 100644
--- a/lib/time/zoneinfo.zip
+++ b/lib/time/zoneinfo.zip
Binary files differ