Mercurial > hg > truffle

changeset 694:eae95c5579a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Fri, 03 Apr 2009 19:54:45 -0700
parents 5373f8d7025b (diff) 2c1dbb844832 (current diff)
children fafab5d5349c
files
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 02 18:17:03 2009 -0400
+++ b/.hgtags	Fri Apr 03 19:54: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	Thu Apr 02 18:17:03 2009 -0400
+++ b/make/hotspot_version	Fri Apr 03 19:54: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_MINOR_VER=0
-HS_BUILD_NUMBER=04
+HS_BUILD_NUMBER=05
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7