changeset 23495:e30be4c0f1da

Merge
author asaha
date Thu, 23 Jul 2015 11:20:44 -0700
parents 2a559ddea547 (diff) 142822562c80 (current diff)
children c71344fad7a7
files .hgtags
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 23 10:56:10 2015 -0700
+++ b/.hgtags	Thu Jul 23 11:20:44 2015 -0700
@@ -728,3 +728,4 @@
 3070e116da4cfebc2ceb0df8f40faeefd38a6d4a jdk8u65-b06
 878cb0df27c22c6b1e9f4add1eb3da3edc8ab51d jdk8u66-b00
 777a354cada52b831a32bfc5362ad7cedfde4450 jdk8u66-b01
+9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00
--- a/make/hotspot_version	Thu Jul 23 10:56:10 2015 -0700
+++ b/make/hotspot_version	Thu Jul 23 11:20:44 2015 -0700
@@ -31,10 +31,10 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2015
+HOTSPOT_VM_COPYRIGHT=Copyright 2016
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=66
+HS_MINOR_VER=71
 HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1