Mercurial > hg > truffle

diff make/hotspot_version @ 17595:3eed8712d410

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u11-b12
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 12:09:28 +0200
parents 562643f42b65 eb984acb23fe
children 52b4284cb496
line wrap: on
line diff
--- a/make/hotspot_version	Wed Oct 15 12:04:20 2014 +0200
+++ b/make/hotspot_version	Wed Oct 15 12:09:28 2014 +0200
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2014
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=5
-HS_BUILD_NUMBER=02
+HS_MINOR_VER=11
+HS_BUILD_NUMBER=03
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8