Merge

Thu, 22 Jan 2015 09:36:34 -0800

author
asaha
date
Thu, 22 Jan 2015 09:36:34 -0800
changeset 7902
ad0cbda3bfa0
parent 7729
9f5afbcc45ce
parent 7901
9da356c2ca06
child 7903
6b8e200bdda1

Merge

.hgtags file | annotate | diff | comparison | revisions
make/hotspot_version file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Mon Jan 19 12:28:21 2015 -0800
     1.2 +++ b/.hgtags	Thu Jan 22 09:36:34 2015 -0800
     1.3 @@ -590,3 +590,4 @@
     1.4  41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01
     1.5  626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02
     1.6  f41aa01b0a043611ee0abcb81a40f7d80085ec27 jdk8u45-b03
     1.7 +b22b01407a8140041545afe1f2d6335db4d94ba5 jdk8u51-b00
     2.1 --- a/make/hotspot_version	Mon Jan 19 12:28:21 2015 -0800
     2.2 +++ b/make/hotspot_version	Thu Jan 22 09:36:34 2015 -0800
     2.3 @@ -34,7 +34,7 @@
     2.4  HOTSPOT_VM_COPYRIGHT=Copyright 2015
     2.5  
     2.6  HS_MAJOR_VER=25
     2.7 -HS_MINOR_VER=45
     2.8 +HS_MINOR_VER=51
     2.9  HS_BUILD_NUMBER=01
    2.10  
    2.11  JDK_MAJOR_VER=1

mercurial