diff make/hotspot_version @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 3eed8712d410 90b2ae0b131d
children eaf39a954227
line wrap: on
line diff
--- a/make/hotspot_version	Thu Oct 16 10:21:29 2014 +0200
+++ b/make/hotspot_version	Wed Oct 15 16:02:50 2014 +0200
@@ -34,8 +34,8 @@
 HOTSPOT_VM_COPYRIGHT=Copyright 2014
 
 HS_MAJOR_VER=25
-HS_MINOR_VER=11
-HS_BUILD_NUMBER=03
+HS_MINOR_VER=20
+HS_BUILD_NUMBER=23
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8