comparison make/hotspot_version @ 20536:73d61cd3f8e9

Merge
author asaha
date Wed, 08 Oct 2014 14:13:23 -0700
parents 20214a1d2c28 46ffdf376cb5
children 1b3abbeee961
comparison
equal deleted inserted replaced
20535:8956e19bdffb 20536:73d61cd3f8e9
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=12 38 HS_BUILD_NUMBER=13
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