changeset 5083:ac0063b4452b jdk7u55-b01

Merge
author asaha
date Mon, 16 Dec 2013 13:04:36 -0800
parents 496f7585f7d0 (diff) dd90f1ad1fe8 (current diff)
children 2f09c332de9b
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot_version	Mon Dec 16 12:12:41 2013 -0800
+++ b/make/hotspot_version	Mon Dec 16 13:04:36 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