diff make/hotspot_version @ 21873:13c8dfb0ff22

Merge
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 09 Jun 2015 11:56:04 +0200
parents 12dcf5ba8b34
children
line wrap: on
line diff
--- a/make/hotspot_version	Tue Jun 09 11:53:26 2015 +0200
+++ b/make/hotspot_version	Tue Jun 09 11:56:04 2015 +0200
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2015
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=40
-HS_BUILD_NUMBER=25
+HS_MINOR_VER=45
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8