Mercurial > hg > truffle

changeset 4085:1d090cf33da6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coleenp
date Mon, 21 Nov 2011 10:22:04 -0500
parents da4182086289 (diff) c17bc65648de (current diff)
children 81a08cd7f6a1 3a298e04d914 da4dd142ea01
files
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Nov 21 08:02:40 2011 +0100
+++ b/.hgtags	Mon Nov 21 10:22:04 2011 -0500
@@ -197,3 +197,6 @@
 6534482ff68ad79066dfe15dfb6d8905f09681bd hs23-b04
 1d3900713a67a0a39faf4e12c9c158d55aebef87 jdk8-b12
 3e609627e780736f372eb14d29bb9b5e53b21fbf hs23-b05
+b92ca8e229d29004f840c67e620833d23a346761 jdk8-b13
+088d09a130ff02d8f5f05e92256baabe412f0439 jdk8-b14
+6c2a55d4902f202e1c2de1df17b7da083a2c31e8 hs23-b06
--- a/make/hotspot_version	Mon Nov 21 08:02:40 2011 +0100
+++ b/make/hotspot_version	Mon Nov 21 10:22:04 2011 -0500
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=23
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=06
+HS_BUILD_NUMBER=07
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8