comparison make/hotspot_version @ 17572:cc7a96a360d0

Merge
author asaha
date Tue, 11 Mar 2014 14:02:23 -0700
parents 559d297c72e9
children 562643f42b65 0037e964ce48 a18dafb24f80
comparison
equal deleted inserted replaced
17571:c02077c4b79c 17572:cc7a96a360d0
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=5 37 HS_MINOR_VER=5
38 HS_BUILD_NUMBER=01 38 HS_BUILD_NUMBER=02
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