comparison make/hotspot_version @ 18020:4b6480cffe2f

Merge
author asaha
date Thu, 26 Jun 2014 07:52:19 -0700
parents 7ef8ab2bf2b0 168c10900e79
children 9f169829d0e1 71d4b9b14f9f
comparison
equal deleted inserted replaced
18019:d094914a65e6 18020:4b6480cffe2f
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=20 37 HS_MINOR_VER=20
38 HS_BUILD_NUMBER=19 38 HS_BUILD_NUMBER=20
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