changeset 6218:0bca41b2fa63

Merge
author jiangli
date Tue, 17 Jul 2012 12:32:26 -0400
parents 54e66510c9cd (diff) e74da3c2b827 (current diff)
children 7553d441b878 dd785aabe02b
files
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Jul 13 20:14:27 2012 -0400
+++ b/.hgtags	Tue Jul 17 12:32:26 2012 -0400
@@ -258,3 +258,6 @@
 831e5c76a20af18f3c08c5a95ed31be0e128a010 jdk8-b44
 9d5f20961bc5846fa8d098d534effafbbdae0a58 jdk8-b45
 40e5a3f2907ed02b335c7caa8ecf068cc801380d hs24-b15
+cf37a594c38db2ea926954154636f9f81da2e032 jdk8-b46
+0c7bb1f4f9c8062b5c5bfa56b3bdca44839b4109 jdk8-b47
+66b0450071c1534e014b131892cc86b63f1d009c hs24-b16
--- a/make/hotspot_version	Fri Jul 13 20:14:27 2012 -0400
+++ b/make/hotspot_version	Tue Jul 17 12:32:26 2012 -0400
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=24
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=16
+HS_BUILD_NUMBER=17
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8