Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authordcubed
Wed, 26 Jan 2011 21:26:52 -0800
changeset 8062 dae5a09060f4
parent 8060 58919e334c17 (diff)
parent 8061 07585870d15f (current diff)
child 8070 e649504b405b
Merge
--- a/hotspot/.hgtags	Tue Jan 25 00:14:21 2011 -0500
+++ b/hotspot/.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/hotspot/make/hotspot_version	Tue Jan 25 00:14:21 2011 -0500
+++ b/hotspot/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
jdk-sandbox