Mercurial > hg > truffle
changeset 1332:4b60f23c4223 hs18-b02 jdk7-b88
Merge
author | acorn |
---|---|
date | Thu, 01 Apr 2010 20:48:50 -0400 |
parents | 7c358fbb6a84 (current diff) 096b18156d91 (diff) |
children | 3f12a94552cc 5b29c2368d93 9bb91718aaf2 0fd6320854d3 56507bcd639e |
files | |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Apr 01 11:23:01 2010 -0400 +++ b/.hgtags Thu Apr 01 20:48:50 2010 -0400 @@ -83,3 +83,6 @@ ffc8d176b84bcfb5ac21302b4feb3b0c0d69b97c jdk7-b84 6c9796468b91dcbb39e09dfa1baf9779ac45eb66 jdk7-b85 418bc80ce13995149eadc9eecbba21d7a9fa02ae hs17-b10 +bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86 +07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01 +e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
--- a/make/hotspot_version Thu Apr 01 11:23:01 2010 -0400 +++ b/make/hotspot_version Thu Apr 01 20:48:50 2010 -0400 @@ -31,11 +31,11 @@ # # Don't put quotes (fail windows build). -HOTSPOT_VM_COPYRIGHT=Copyright 2009 +HOTSPOT_VM_COPYRIGHT=Copyright 2010 -HS_MAJOR_VER=17 +HS_MAJOR_VER=18 HS_MINOR_VER=0 -HS_BUILD_NUMBER=10 +HS_BUILD_NUMBER=02 JDK_MAJOR_VER=1 JDK_MINOR_VER=7