comparison make/hotspot_version @ 20678:97f4214e9a70

Merge
author coleenp
date Mon, 01 Dec 2014 09:38:52 -0500
parents dcccfe952e9b
children 9c8dbbd8694a 4b41145051ab
comparison
equal deleted inserted replaced
20677:fe34c5ab0b35 20678:97f4214e9a70
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=40 37 HS_MINOR_VER=40
38 HS_BUILD_NUMBER=21 38 HS_BUILD_NUMBER=22
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