Mercurial > hg > openjdk > hsx20

changeset 2021:0915f9be781c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author trims
date Thu, 13 Jan 2011 22:54:23 -0800
parents 76d6282dcfe5 (diff) ffd725ff6943 (current diff)
children 75efcee5ac47
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jan 13 17:19:21 2011 -0800
+++ b/.hgtags	Thu Jan 13 22:54:23 2011 -0800
@@ -140,3 +140,5 @@
 9669f9b284108a9ee0a0ccbe215c37a130c9dcf5 hs20-b04
 0a8e0d4345b37b71ec49dda08ee03b68c4f1b592 jdk7-b124
 0a8e0d4345b37b71ec49dda08ee03b68c4f1b592 hs20-b05
+e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 jdk7-b125
+e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 hs20-b06
--- a/make/hotspot_version	Thu Jan 13 17:19:21 2011 -0800
+++ b/make/hotspot_version	Thu Jan 13 22:54:23 2011 -0800
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=20
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=06
+HS_BUILD_NUMBER=07
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7