changeset 1372:e16cca0aa5e1

Merge
author trims
date Thu, 15 Apr 2010 19:08:48 -0700
parents 4c78b7c16824 (diff) fc3cd2277dc7 (current diff)
children 25f53b53aaa3
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 13 13:01:37 2010 -0700
+++ b/.hgtags	Thu Apr 15 19:08:48 2010 -0700
@@ -86,3 +86,4 @@
 bf823ef06b4f211e66988d76a2e2669be5c0820e jdk7-b86
 07226e9eab8f74b37346b32715f829a2ef2c3188 hs18-b01
 e7e7e36ccdb5d56edd47e5744351202d38f3b7ad jdk7-b87
+4b60f23c42231f7ecd62ad1fcb6a9ca26fa57d1b jdk7-b88
--- a/make/hotspot_version	Tue Apr 13 13:01:37 2010 -0700
+++ b/make/hotspot_version	Thu Apr 15 19:08:48 2010 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=18
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=02
+HS_BUILD_NUMBER=03
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7