Mercurial > hg > truffle

diff make/hotspot_version @ 17560:562643f42b65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with jdk8u5-b13
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 12:04:20 +0200
parents 89152779163c 559d297c72e9
children 3eed8712d410
line wrap: on
line diff
--- a/make/hotspot_version	Wed Oct 15 11:59:32 2014 +0200
+++ b/make/hotspot_version	Wed Oct 15 12:04:20 2014 +0200
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2014
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=0
-HS_BUILD_NUMBER=70
+HS_MINOR_VER=5
+HS_BUILD_NUMBER=02
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8