changeset 4572:cd85890e1926

Merge
author zgu
date Fri, 29 Mar 2013 07:31:53 -0700
parents aea9eb48dafd 7c8d60d568ba
children ad6f90552a1c
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Mar 29 10:02:52 2013 -0400
+++ b/.hgtags	Fri Mar 29 07:31:53 2013 -0700
@@ -459,3 +459,5 @@
 7416b0a84e3c5b0eea46affb71cc36cc729c040c hs24-b36
 61822da2b149bd272b5e7b727c142635f1d52d5c jdk7u14-b17
 c5c01d4cd7d9a5141e0945a5811c76267da0df13 hs24-b37
+72e4bc0bcbd2b23d70115fc9d92525bf3c23aa1d jdk7u14-b18
+795212ad5b1b9c43ab3cea5680a37e759641f3bf hs24-b38
--- a/make/hotspot_version	Fri Mar 29 10:02:52 2013 -0400
+++ b/make/hotspot_version	Fri Mar 29 07:31:53 2013 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=24
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=38
+HS_BUILD_NUMBER=39
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7