changeset 1036:d912f17c1ae4

Merge
author xlu
date Wed, 28 Oct 2009 10:37:17 -0700
parents a3b9e96881fe d8dd291a362a
children 4926bf2d292f
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Oct 23 18:44:33 2009 -0700
+++ b/.hgtags	Wed Oct 28 10:37:17 2009 -0700
@@ -48,3 +48,4 @@
 50a95aa4a247f0cbbf66df285a8b1d78ffb153d9 jdk7-b71
 a94714c550658fd6741793ef036cb9625dc2ab1a jdk7-b72
 faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
+f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
--- a/make/hotspot_version	Fri Oct 23 18:44:33 2009 -0700
+++ b/make/hotspot_version	Wed Oct 28 10:37:17 2009 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=04
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7