comparison make/hotspot_version @ 23158:8fd636dd1c91

Merge
author asaha
date Wed, 10 Jun 2015 23:13:44 -0700
parents 67f2485a64d4 173f9910da57
children 06114526675f b6815d853c35
comparison
equal deleted inserted replaced
23157:0e5f64fa55c9 23158:8fd636dd1c91
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=18 38 HS_BUILD_NUMBER=19
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