Mercurial > hg > truffle

changeset 3890:4668545121b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jcoomes
date Fri, 02 Sep 2011 21:33:57 -0700
parents 5c123cbeebbe (diff) ae1b1788f63f (current diff)
children d968f546734e 2fecca53a2c6 27702f012017
files
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Aug 31 23:55:58 2011 -0700
+++ b/.hgtags	Fri Sep 02 21:33:57 2011 -0700
@@ -174,3 +174,10 @@
 9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
 c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
 c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
+0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
+31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
+3a2fb61165dfc72e398179a2796d740c8da5b8c0 jdk8-b03
+0cc8a70952c368e06de2adab1f2649a408f5e577 hs22-b01
+7c29742c41b44fb0cd5a13c7ac8834f3f2ca649e hs22-b02
+3a2fb61165dfc72e398179a2796d740c8da5b8c0 hs22-b03
+ce9bde819dcba4a5d2822229d9183e69c74326ca hs22-b04
--- a/make/hotspot_version	Wed Aug 31 23:55:58 2011 -0700
+++ b/make/hotspot_version	Fri Sep 02 21:33:57 2011 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=22
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=03
+HS_BUILD_NUMBER=04
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8