changeset 23197:8f842c15481a

Merge
author asaha
date Mon, 06 Apr 2015 12:35:26 -0700
parents e45c86169f94 (diff) 28ac8022026a (current diff)
children e5ddbfc644c9
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Apr 06 12:26:32 2015 -0700
+++ b/.hgtags	Mon Apr 06 12:35:26 2015 -0700
@@ -622,3 +622,4 @@
 5c017acbaf015fb8ecca6f00870965f3deb4e1ac jdk8u51-b07
 0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
 9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
+0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
--- a/make/hotspot_version	Mon Apr 06 12:26:32 2015 -0700
+++ b/make/hotspot_version	Mon Apr 06 12:35:26 2015 -0700
@@ -34,7 +34,7 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=51
+HS_MINOR_VER=65
 HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1