aboutsummaryrefslogtreecommitdiff
path: root/make/data/tzdata/VERSION
diff options
context:
space:
mode:
authorenevill <none@none>2015-02-03 16:48:44 +0000
committerenevill <none@none>2015-02-03 16:48:44 +0000
commitc26732096683f10b1dc943fb9e69078447dc589f (patch)
tree4fbd7245906343a60a21874ab5eb5db52202dbf9 /make/data/tzdata/VERSION
parent8a571e61d318c95238bb18d1309a289a20668a07 (diff)
parent3ce3ea69ff7ce237c597e785fb64cd17781df638 (diff)
Merge up to jdk8u40-b23
Diffstat (limited to 'make/data/tzdata/VERSION')
-rw-r--r--make/data/tzdata/VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION
index 5e925ada8..9987fde6d 100644
--- a/make/data/tzdata/VERSION
+++ b/make/data/tzdata/VERSION
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2014g
+tzdata2014j