Merge

Wed, 16 Oct 2013 11:48:03 -0700

author
ccheung
date
Wed, 16 Oct 2013 11:48:03 -0700
changeset 5899
e8703d708e6e
parent 5898
f509b8f4699b
parent 5883
7c26dced065e
child 5929
8f4bb1773fd9

Merge

     1.1 --- a/.hgtags	Tue Oct 15 08:25:43 2013 -0700
     1.2 +++ b/.hgtags	Wed Oct 16 11:48:03 2013 -0700
     1.3 @@ -383,3 +383,5 @@
     1.4  58043478c26d4e8bf48700acea5f97aba8b417d4 hs25-b52
     1.5  6209b0ed51c086d4127bac0e086c8f326d1764d7 jdk8-b110
     1.6  562a3d356de67670b4172b82aca2d30743449e04 hs25-b53
     1.7 +f6962730bbde82f279a0ae3a1c14bc5e58096c6e jdk8-b111
     1.8 +4a845c7a463844cead9e1e1641d6bcfb8a77f1c7 hs25-b54
     2.1 --- a/make/hotspot_version	Tue Oct 15 08:25:43 2013 -0700
     2.2 +++ b/make/hotspot_version	Wed Oct 16 11:48:03 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=54
     2.8 +HS_BUILD_NUMBER=55
     2.9  
    2.10  JDK_MAJOR_VER=1
    2.11  JDK_MINOR_VER=8

mercurial