Mercurial > hg > truffle

diff make/hotspot_version @ 18104:eaf39a954227

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u25-b17
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 16 Oct 2014 11:57:39 +0200
parents 52b4284cb496 853a5158a1e2
children 7848fc12602b
line wrap: on
line diff
--- a/make/hotspot_version	Thu Oct 16 11:16:01 2014 +0200
+++ b/make/hotspot_version	Thu Oct 16 11:57:39 2014 +0200
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2014
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=20
-HS_BUILD_NUMBER=23
+HS_MINOR_VER=25
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8