comparison make/hotspot_version @ 20789:6bed0ca7a09a

Merge
author asaha
date Wed, 17 Dec 2014 12:48:26 -0800
parents c4f1e23c4139 9c8dbbd8694a
children 6ac667bd4eb1 eff80b90c3ad
comparison
equal deleted inserted replaced
20788:c4f1e23c4139 20789:6bed0ca7a09a
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=22 38 HS_BUILD_NUMBER=23
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