Mercurial > hg > truffle

changeset 3379:ea4859d7fee7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author brutisso
date Wed, 18 May 2011 13:19:32 +0200
parents c149193c768b (diff) 69293e516993 (current diff)
children 3f3325361b86
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue May 17 00:56:01 2011 -0700
+++ b/.hgtags	Wed May 18 13:19:32 2011 +0200
@@ -170,3 +170,5 @@
 d283b82966712b353fa307845a1316da42a355f4 hs21-b10
 5d07913abd59261c77f24cc04a759cb75d804099 jdk7-b141
 3aea9e9feb073f5500e031be6186666bcae89aa2 hs21-b11
+9ad1548c6b63d596c411afc35147ffd5254426d9 jdk7-b142
+9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
--- a/make/hotspot_version	Tue May 17 00:56:01 2011 -0700
+++ b/make/hotspot_version	Wed May 18 13:19:32 2011 +0200
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=21
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=12
+HS_BUILD_NUMBER=13
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=7