changeset 2381:f195ebb181b8

Merge
author jcoomes
date Thu, 24 Mar 2011 23:00:27 -0700
parents b898f0fc3ced (diff) 32f7097f9d8f (current diff)
children 0e3ed5a14f73
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Mar 23 10:55:43 2011 -0700
+++ b/.hgtags	Thu Mar 24 23:00:27 2011 -0700
@@ -154,3 +154,5 @@
 0e531ab5ba04967a0e9aa6aef65e6eb3a0dcf632 jdk7-b132
 a8d643a4db47c7b58e0bcb49c77b5c3610de86a8 hs21-b03
 1b3a350709e4325d759bb453ff3fb6a463270488 jdk7-b133
+447e6faab4a8755d4860c2366630729dbaec111c jdk7-b134
+3c76374706ea8a77e15aec8310e831e5734f8775 hs21-b04
--- a/make/hotspot_version	Wed Mar 23 10:55:43 2011 -0700
+++ b/make/hotspot_version	Thu Mar 24 23:00:27 2011 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=21
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=04
+HS_BUILD_NUMBER=05
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7