Merge

Thu, 09 Apr 2009 13:59:45 -0700

author
xlu
date
Thu, 09 Apr 2009 13:59:45 -0700
changeset 1138
68cd0d7ee9bb
parent 1137
b9fba36710f2
parent 1136
a63bc96715a9
child 1147
6e33bfd4139b

Merge

     1.1 --- a/.hgtags	Mon Apr 06 15:47:39 2009 -0700
     1.2 +++ b/.hgtags	Thu Apr 09 13:59:45 2009 -0700
     1.3 @@ -26,3 +26,5 @@
     1.4  8b22ccb5aba2c6c11bddf6488a7bb7ef5b4bf2be jdk7-b49
     1.5  dae503d9f04c1a11e182dbf7f770509c28dc0609 jdk7-b50
     1.6  2581d90c6c9b2012da930eb4742add94a03069a0 jdk7-b51
     1.7 +1b1e8f1a4fe8cebc01c022484f78148e17b62a0d jdk7-b52
     1.8 +032c6af894dae8d939b3dd31d82042549e7793e0 jdk7-b53
     2.1 --- a/make/hotspot_version	Mon Apr 06 15:47:39 2009 -0700
     2.2 +++ b/make/hotspot_version	Thu Apr 09 13:59:45 2009 -0700
     2.3 @@ -31,11 +31,11 @@
     2.4  #
     2.5  
     2.6  # Don't put quotes (fail windows build).
     2.7 -HOTSPOT_VM_COPYRIGHT=Copyright 2008
     2.8 +HOTSPOT_VM_COPYRIGHT=Copyright 2009
     2.9  
    2.10 -HS_MAJOR_VER=15
    2.11 +HS_MAJOR_VER=16
    2.12  HS_MINOR_VER=0
    2.13 -HS_BUILD_NUMBER=04
    2.14 +HS_BUILD_NUMBER=01
    2.15  
    2.16  JDK_MAJOR_VER=1
    2.17  JDK_MINOR_VER=7

mercurial