comparison make/hotspot_version @ 20767:ee10217e3d03

Merge
author asaha
date Wed, 05 Nov 2014 15:35:11 -0800
parents d961743b7897 68dd4d2b8dc0
children 02c7eebe5f52 b1cf34d57e78
comparison
equal deleted inserted replaced
20766:d961743b7897 20767:ee10217e3d03
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=40
38 HS_BUILD_NUMBER=15 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