changeset 5081:496f7585f7d0

Merge
author asaha
date Tue, 10 Dec 2013 17:15:13 -0800
parents a863ae5351d9 (diff) dee2a38ef6b2 (current diff)
children ac0063b4452b
files make/hotspot_version
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot_version	Tue Dec 10 13:15:48 2013 -0800
+++ b/make/hotspot_version	Tue Dec 10 17:15:13 2013 -0800
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2013
 
 HS_MAJOR_VER=24
-HS_MINOR_VER=51
-HS_BUILD_NUMBER=03
+HS_MINOR_VER=55
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7