changeset 5077:5a869822ce57

Merge
author asaha
date Tue, 19 Nov 2013 09:32:43 -0800
parents be6a1b65ba06 (diff) 4f56f2e206fd (current diff)
children 67c54d2ad34c
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot_version	Tue Nov 19 08:36:58 2013 -0800
+++ b/make/hotspot_version	Tue Nov 19 09:32:43 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