changeset 973:585222cadf79

Merge
author apangin
date Wed, 19 Aug 2009 15:46:22 -0700
parents 6ab1d6ece8bd ac59d4e6dae5
children a774e1abbe85
files
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 17 15:03:39 2009 -0700
+++ b/.hgtags	Wed Aug 19 15:46:22 2009 -0700
@@ -41,3 +41,6 @@
 ba36394eb84b949b31212bdb32a518a8f92bab5b jdk7-b64
 ba313800759b678979434d6da8ed3bf49eb8bea4 jdk7-b65
 57c71ad0341b8b64ed20f81151eb7f06324f8894 jdk7-b66
+18f526145aea355a9320b724373386fc2170f183 jdk7-b67
+d07e68298d4e17ebf93d8299e43fcc3ded26472a jdk7-b68
+54fd4d9232969ea6cd3d236e5ad276183bb0d423 jdk7-b69
--- a/make/hotspot_version	Mon Aug 17 15:03:39 2009 -0700
+++ b/make/hotspot_version	Wed Aug 19 15:46:22 2009 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=16
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=07
+HS_BUILD_NUMBER=08
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7