comparison make/hotspot_version @ 18014:a96ae21442f6

Merge
author asaha
date Tue, 10 Jun 2014 13:43:58 -0700
parents 4941bd9f6483 41daa2e6e52d
children 7ef8ab2bf2b0 1e657b902392
comparison
equal deleted inserted replaced
18013:d394a1056605 18014:a96ae21442f6
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=20 37 HS_MINOR_VER=20
38 HS_BUILD_NUMBER=17 38 HS_BUILD_NUMBER=18
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