changeset 5078:67c54d2ad34c

Merge
author asaha
date Wed, 27 Nov 2013 11:19:05 -0800
parents 5a869822ce57 (diff) 1b7aaef3df78 (current diff)
children fb0e151fb1c6
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot_version	Wed Nov 27 08:20:45 2013 -0800
+++ b/make/hotspot_version	Wed Nov 27 11:19:05 2013 -0800
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2013
 
 HS_MAJOR_VER=24
-HS_MINOR_VER=51
-HS_BUILD_NUMBER=02
+HS_MINOR_VER=55
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7