# HG changeset patch # User ccheung # Date 1381436751 25200 # Node ID c01f4910f5f5d8ff9a81b0004ea2da497017cf62 # Parent d25557d03ec04219c46d13768b03bb6538954741# Parent deec468baebd9775f538def036d964c81ae9a4a5 Merge diff -r d25557d03ec0 -r c01f4910f5f5 .hgtags --- a/.hgtags Wed Oct 09 17:57:17 2013 -0400 +++ b/.hgtags Thu Oct 10 13:25:51 2013 -0700 @@ -381,3 +381,5 @@ 566db1b0e6efca31f181456e54c8911d0192410d hs25-b51 c81dd5393a5e333df7cb1f6621f5897ada6522b5 jdk8-b109 58043478c26d4e8bf48700acea5f97aba8b417d4 hs25-b52 +6209b0ed51c086d4127bac0e086c8f326d1764d7 jdk8-b110 +562a3d356de67670b4172b82aca2d30743449e04 hs25-b53 diff -r d25557d03ec0 -r c01f4910f5f5 make/hotspot_version --- a/make/hotspot_version Wed Oct 09 17:57:17 2013 -0400 +++ b/make/hotspot_version Thu Oct 10 13:25:51 2013 -0700 @@ -35,7 +35,7 @@ HS_MAJOR_VER=25 HS_MINOR_VER=0 -HS_BUILD_NUMBER=53 +HS_BUILD_NUMBER=54 JDK_MAJOR_VER=1 JDK_MINOR_VER=8