diff make/hotspot_version @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 3ac7d10a6572 be1fbee20765
children b9a918201d47
line wrap: on
line diff
--- a/make/hotspot_version	Tue Mar 05 21:58:51 2013 +0100
+++ b/make/hotspot_version	Tue Mar 05 23:44:54 2013 +0100
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=17
+HS_BUILD_NUMBER=21
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8