changeset 4793:319bfff22782

Merge
author asaha
date Tue, 27 Aug 2013 15:35:35 -0700
parents 45c4d9353387 956a9282d989
children 7b028a5f4882
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Aug 24 00:14:46 2013 -0700
+++ b/.hgtags	Tue Aug 27 15:35:35 2013 -0700
@@ -564,6 +564,7 @@
 74de360e341530494c05af1ea1358abea0be93e0 jdk7u40-b39
 86673506aeb60dfa66d90233e6bbbb06e864589e jdk7u40-b40
 4445f65c4793f8421c12423396776f36765433a8 jdk7u40-b41
+4e779305ed58e21b433626ac06b5eb884055183b jdk7u40-b42
 5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
 f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02
 d6fd3f84a30ce82a37fc39b6e5e9d73bd8054ab2 jdk7u45-b03
@@ -572,3 +573,4 @@
 63efa616e54dd3545e16a5aa1917662548b18ee5 jdk7u45-b06
 f6748e6123b6745497d69addffdff38e224a77c5 jdk7u45-b07
 06bcab9ef18355dccc87401fc24dbd5f15615db0 jdk7u45-b08
+996b6863b3b2468cece20d7a6f571f9ec1b7830c jdk7u45-b09
--- a/make/hotspot_version	Sat Aug 24 00:14:46 2013 -0700
+++ b/make/hotspot_version	Tue Aug 27 15:35:35 2013 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=24
 HS_MINOR_VER=45
-HS_BUILD_NUMBER=06
+HS_BUILD_NUMBER=07
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7