comparison make/hotspot_version @ 21873:13c8dfb0ff22

Merge
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 09 Jun 2015 11:56:04 +0200
parents 12dcf5ba8b34
children
comparison
equal deleted inserted replaced
21872:fe0d57a9b79b 21873:13c8dfb0ff22
32 32
33 # Don't put quotes (fail windows build). 33 # Don't put quotes (fail windows build).
34 HOTSPOT_VM_COPYRIGHT=Copyright 2015 34 HOTSPOT_VM_COPYRIGHT=Copyright 2015
35 35
36 HS_MAJOR_VER=25 36 HS_MAJOR_VER=25
37 HS_MINOR_VER=40 37 HS_MINOR_VER=45
38 HS_BUILD_NUMBER=25 38 HS_BUILD_NUMBER=02
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