changeset 847:f0a1cbbaf3c0

Merge
author ysr
date Thu, 16 Jul 2009 12:38:26 -0700
parents 42d84bbbecf4 ba313800759b
children 433f394ab509 45d97a99715b
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 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 @@
 
 HS_MAJOR_VER=16
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=06
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7