comparison make/hotspot_version @ 17595:3eed8712d410

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
comparison
equal deleted inserted replaced
17560:562643f42b65 17595:3eed8712d410
32 32
33 # Don't put quotes (fail windows build). 33 # Don't put quotes (fail windows build).
34 HOTSPOT_VM_COPYRIGHT=Copyright 2014 34 HOTSPOT_VM_COPYRIGHT=Copyright 2014
35 35
36 HS_MAJOR_VER=25 36 HS_MAJOR_VER=25
37 HS_MINOR_VER=5 37 HS_MINOR_VER=11
38 HS_BUILD_NUMBER=02 38 HS_BUILD_NUMBER=03
39 39
40 JDK_MAJOR_VER=1 40 JDK_MAJOR_VER=1
41 JDK_MINOR_VER=8 41 JDK_MINOR_VER=8
42 JDK_MICRO_VER=0 42 JDK_MICRO_VER=0
43 43