comparison make/hotspot_version @ 23034:5efc25c36716 hs25.60-b17

Merge
author amurillo
date Thu, 21 May 2015 22:54:21 -0700
parents 12cd98726f57
children 74472adaf90d 8dddcd728302
comparison
equal deleted inserted replaced
23019:a20bd9718799 23034:5efc25c36716
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=60 37 HS_MINOR_VER=60
38 HS_BUILD_NUMBER=16 38 HS_BUILD_NUMBER=17
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