Merge

Thu, 10 Oct 2013 13:25:51 -0700

author
ccheung
date
Thu, 10 Oct 2013 13:25:51 -0700
changeset 5854
c01f4910f5f5
parent 5853
d25557d03ec0
parent 5824
deec468baebd
child 5865
aa6f2ea19d8f

Merge

     1.1 --- a/.hgtags	Wed Oct 09 17:57:17 2013 -0400
     1.2 +++ b/.hgtags	Thu Oct 10 13:25:51 2013 -0700
     1.3 @@ -381,3 +381,5 @@
     1.4  566db1b0e6efca31f181456e54c8911d0192410d hs25-b51
     1.5  c81dd5393a5e333df7cb1f6621f5897ada6522b5 jdk8-b109
     1.6  58043478c26d4e8bf48700acea5f97aba8b417d4 hs25-b52
     1.7 +6209b0ed51c086d4127bac0e086c8f326d1764d7 jdk8-b110
     1.8 +562a3d356de67670b4172b82aca2d30743449e04 hs25-b53
     2.1 --- a/make/hotspot_version	Wed Oct 09 17:57:17 2013 -0400
     2.2 +++ b/make/hotspot_version	Thu Oct 10 13:25:51 2013 -0700
     2.3 @@ -35,7 +35,7 @@
     2.4  
     2.5  HS_MAJOR_VER=25
     2.6  HS_MINOR_VER=0
     2.7 -HS_BUILD_NUMBER=53
     2.8 +HS_BUILD_NUMBER=54
     2.9  
    2.10  JDK_MAJOR_VER=1
    2.11  JDK_MINOR_VER=8

mercurial