changeset 5584:e8703d708e6e

Merge
author ccheung
date Wed, 16 Oct 2013 11:48:03 -0700
parents f509b8f4699b 7c26dced065e
children 8f4bb1773fd9
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Oct 15 08:25:43 2013 -0700
+++ b/.hgtags	Wed Oct 16 11:48:03 2013 -0700
@@ -383,3 +383,5 @@
 58043478c26d4e8bf48700acea5f97aba8b417d4 hs25-b52
 6209b0ed51c086d4127bac0e086c8f326d1764d7 jdk8-b110
 562a3d356de67670b4172b82aca2d30743449e04 hs25-b53
+f6962730bbde82f279a0ae3a1c14bc5e58096c6e jdk8-b111
+4a845c7a463844cead9e1e1641d6bcfb8a77f1c7 hs25-b54
--- a/make/hotspot_version	Tue Oct 15 08:25:43 2013 -0700
+++ b/make/hotspot_version	Wed Oct 16 11:48:03 2013 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=54
+HS_BUILD_NUMBER=55
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8