# HG changeset patch
# User asaha
# Date 1437076447 25200
# Node ID 3070e116da4cfebc2ceb0df8f40faeefd38a6d4a
# Parent  9a158a0c243beb610dbaabd63d6218d3ce5825f1# Parent  1bfa56af88696a8e61b5ec36720c3b14a9a4abb9
Merge

diff -r 1bfa56af8869 -r 3070e116da4c .hgtags
--- a/.hgtags	Wed Jul 15 14:16:46 2015 -0700
+++ b/.hgtags	Thu Jul 16 12:54:07 2015 -0700
@@ -716,3 +716,11 @@
 0e4094950cd312c8f95c7f37336606323fe049fe jdk8u60-b23
 d89ceecf1bad55e1aee2932b8895d60fc64c15db hs25.60-b23
 fb157d537278cda4150740e27bb57cd8694e15bf jdk8u60-b24
+0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u52-b06
+9b6f44853eed8caba935915c7e710c546b205c8e jdk8u52-b07
+0219ab69f00782e5c49687e2fa75138a7ffddea1 jdk8u65-b00
+b6815d853c359be92e61f422ea5018af1f81d0c7 jdk8u65-b01
+488661b9cbdaeb24be14873f3bd39a945575692a jdk8u65-b02
+ea47136e6ea4253c0bf238fb61760f98a8d01ebc jdk8u65-b03
+2a03fd592fe60fd113c1c89e431ebaa6857c4998 jdk8u65-b04
+aa915217a00c4b8ce0e82d1b23fa1df8a9e4cc70 jdk8u65-b05
diff -r 1bfa56af8869 -r 3070e116da4c make/hotspot_version
--- a/make/hotspot_version	Wed Jul 15 14:16:46 2015 -0700
+++ b/make/hotspot_version	Thu Jul 16 12:54:07 2015 -0700
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=60
-HS_BUILD_NUMBER=23
+HS_MINOR_VER=65
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8