changeset 1052:9174bb32e934 hs17-b05 jdk7-b76

Merge
author trims
date Fri, 06 Nov 2009 00:41:40 -0800
parents 50c16f09ddf5 (diff) 26f1542097f1 (current diff)
children 455105fc81d9 2f1ec89b9995
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Nov 03 16:43:16 2009 -0800
+++ b/.hgtags	Fri Nov 06 00:41:40 2009 -0800
@@ -49,3 +49,4 @@
 a94714c550658fd6741793ef036cb9625dc2ab1a jdk7-b72
 faf94d94786b621f8e13cbcc941ca69c6d967c3f jdk7-b73
 f4b900403d6e4b0af51447bd13bbe23fe3a1dac7 jdk7-b74
+d8dd291a362acb656026a9c0a9da48501505a1e7 jdk7-b75
--- a/make/hotspot_version	Tue Nov 03 16:43:16 2009 -0800
+++ b/make/hotspot_version	Fri Nov 06 00:41:40 2009 -0800
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=17
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=04
+HS_BUILD_NUMBER=05
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7