changeset 1299:dba18cabafec

Merge
author trims
date Fri, 05 Feb 2010 12:26:35 -0800
parents 7f8790caccb0 1999f5b12482
children ff3232b68fbb
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Feb 04 15:50:59 2010 -0800
+++ b/.hgtags	Fri Feb 05 12:26:35 2010 -0800
@@ -54,3 +54,5 @@
 455105fc81d941482f8f8056afaa7aa0949c9300 jdk7-b77
 e703499b4b51e3af756ae77c3d5e8b3058a14e4e jdk7-b78
 a5a6adfca6ecefb5894a848debabfe442ff50e25 jdk7-b79
+3003ddd1d4330b06cb4691ae74d600d3685899eb jdk7-b80
+1f9b07674480c224828852ffe137beea36b3cab5 jdk7-b81
--- a/make/hotspot_version	Thu Feb 04 15:50:59 2010 -0800
+++ b/make/hotspot_version	Fri Feb 05 12:26:35 2010 -0800
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=07
+HS_BUILD_NUMBER=08
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7