# HG changeset patch # User zgu # Date 1380128601 14400 # Node ID e8a0010ba69eaba41502c51cd2f420e8de90a9b3 # Parent 8a6a85321d3ac72d203e59caeb0c5c715660da1f# Parent 084b21cd0228369a44767e2d2e821f8e704612ee Merge diff -r 084b21cd0228 -r e8a0010ba69e make/hotspot_version --- a/make/hotspot_version Mon Sep 23 08:56:19 2013 -0700 +++ b/make/hotspot_version Wed Sep 25 13:03:21 2013 -0400 @@ -35,7 +35,7 @@ HS_MAJOR_VER=25 HS_MINOR_VER=0 -HS_BUILD_NUMBER=51 +HS_BUILD_NUMBER=52 JDK_MAJOR_VER=1 JDK_MINOR_VER=8