diff make/hotspot_version @ 18060:b207affc0618

Merge
author asaha
date Tue, 03 Jun 2014 21:36:53 -0700
parents d6fcbd1e1075 dbcd3fcdba84
children e47c5dad18f2
line wrap: on
line diff
--- a/make/hotspot_version	Tue Jun 03 07:29:16 2014 -0700
+++ b/make/hotspot_version	Tue Jun 03 21:36:53 2014 -0700
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2014
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=20
-HS_BUILD_NUMBER=16
+HS_MINOR_VER=25
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8