changeset 5419:c01f4910f5f5

Merge
author ccheung
date Thu, 10 Oct 2013 13:25:51 -0700
parents d25557d03ec0 deec468baebd
children aa6f2ea19d8f
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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