Merge
authorysr
Thu Jul 16 12:38:26 2009 -0700 (7 months ago)
changeset 847f0a1cbbaf3c0
parent 84642d84bbbecf4
parent 841ba313800759b
child 860433f394ab509
child 86145d97a99715b
Merge
--- a/.hgtags Wed Jul 15 12:22:59 2009 -0400
+++ b/.hgtags Thu Jul 16 12:38:26 2009 -0700
@@ -37,3 +37,5 @@ a77eddcd510c3972717c025cfcef9a60bfa4ecac
a77eddcd510c3972717c025cfcef9a60bfa4ecac jdk7-b60
27b728fd1281ab62e9d7e4424f8bbb6ca438d803 jdk7-b61
a88386380bdaaa5ab4ffbedf22c57bac5dbec034 jdk7-b62
+32c83fb84370a35344676991a48440378e6b6c8a jdk7-b63
+ba36394eb84b949b31212bdb32a518a8f92bab5b jdk7-b64
--- a/make/hotspot_version Wed Jul 15 12:22:59 2009 -0400
+++ b/make/hotspot_version Thu Jul 16 12:38:26 2009 -0700
@@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2009
HS_MAJOR_VER=16
HS_MINOR_VER=0
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=06
JDK_MAJOR_VER=1
JDK_MINOR_VER=7