Mercurial > hg > truffle
changeset 2163:515cc1a31fd1
Merge
author | dcubed |
---|---|
date | Wed, 26 Jan 2011 21:26:52 -0800 |
parents | d19d8218a399 (diff) ccfcb502af3f (current diff) |
children | 9846d99e16d3 |
files | |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Jan 25 00:14:21 2011 -0500 +++ b/.hgtags Wed Jan 26 21:26:52 2011 -0800 @@ -143,3 +143,4 @@ e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 jdk7-b125 4c851c931d001a882cab809aaf3a55371b919244 jdk7-b126 e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 hs20-b06 +d535bf4c12355a2897e918da9f8910c0aceec4fb hs20-b07
--- a/make/hotspot_version Tue Jan 25 00:14:21 2011 -0500 +++ b/make/hotspot_version Wed Jan 26 21:26:52 2011 -0800 @@ -33,9 +33,9 @@ # Don't put quotes (fail windows build). HOTSPOT_VM_COPYRIGHT=Copyright 2011 -HS_MAJOR_VER=20 +HS_MAJOR_VER=21 HS_MINOR_VER=0 -HS_BUILD_NUMBER=07 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=7