changeset 379:af90fe21c1e3

Merge
author trims
date Wed, 01 Oct 2008 16:57:40 -0700
parents 0e31d37915ff (diff) ddfad9496151 (current diff)
children eb28cf662f56 c005b6eac36e
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Oct 01 15:05:06 2008 -0400
+++ b/.hgtags	Wed Oct 01 16:57:40 2008 -0700
@@ -10,3 +10,4 @@
 585535ec8a14adafa6bfea65d6975e29094c8cec jdk7-b33
 5251a9cd8eb8743eee647365bee1c8afdc131556 jdk7-b34
 5fa96a5a7e76da7c8dad12486293a0456c2c116c jdk7-b35
+e91159f921a58af3698e6479ea1fc5818da66d09 jdk7-b36
--- a/make/hotspot_version	Wed Oct 01 15:05:06 2008 -0400
+++ b/make/hotspot_version	Wed Oct 01 16:57:40 2008 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=14
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=05
+HS_BUILD_NUMBER=06
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7