Mercurial > hg > truffle

changeset 18048:526a628b7b24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 16 Apr 2014 09:51:54 -0700
parents 096a7e12d63f (current diff) 0ab62d80a754 (diff)
children f3c3ce3fb624
files
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 15 16:17:20 2014 -0400
+++ b/.hgtags	Wed Apr 16 09:51:54 2014 -0700
@@ -438,3 +438,6 @@
 8a67179106085689906732013a282efeeb9bd5f4 jdk8u5-b13
 f0d759a6a2309a1c149d530b29db24eda885f267 jdk8u11-b01
 3c079aebb516765784dd8097887daadda5a76ac1 jdk8u11-b02
+0037e964ce486c009984171f004259263628079f jdk8u11-b03
+4c40343ecdb33fe046833fe4b8970fd29859c4ad jdk8u11-b04
+a4d44dfb7d30eea54bc172e4429a655454ae0bbf jdk8u25-b00
--- a/make/hotspot_version	Tue Apr 15 16:17:20 2014 -0400
+++ b/make/hotspot_version	Wed Apr 16 09:51:54 2014 -0700
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=11
-HS_BUILD_NUMBER=01
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8