changeset 741:68cd0d7ee9bb

Merge
author xlu
date Thu, 09 Apr 2009 13:59:45 -0700
parents b9fba36710f2 a63bc96715a9
children 6e33bfd4139b
files
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Apr 06 15:47:39 2009 -0700
+++ b/.hgtags	Thu Apr 09 13:59:45 2009 -0700
@@ -26,3 +26,5 @@
 8b22ccb5aba2c6c11bddf6488a7bb7ef5b4bf2be jdk7-b49
 dae503d9f04c1a11e182dbf7f770509c28dc0609 jdk7-b50
 2581d90c6c9b2012da930eb4742add94a03069a0 jdk7-b51
+1b1e8f1a4fe8cebc01c022484f78148e17b62a0d jdk7-b52
+032c6af894dae8d939b3dd31d82042549e7793e0 jdk7-b53
--- a/make/hotspot_version	Mon Apr 06 15:47:39 2009 -0700
+++ b/make/hotspot_version	Thu Apr 09 13:59:45 2009 -0700
@@ -31,11 +31,11 @@
 #
 
 # Don't put quotes (fail windows build).
-HOTSPOT_VM_COPYRIGHT=Copyright 2008
+HOTSPOT_VM_COPYRIGHT=Copyright 2009
 
-HS_MAJOR_VER=15
+HS_MAJOR_VER=16
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=04
+HS_BUILD_NUMBER=01
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7