comparison make/hotspot_version @ 18027:9f169829d0e1

Merge
author asaha
date Tue, 08 Jul 2014 13:25:13 -0700
parents 4b6480cffe2f b334bc7ff73e
children f09d1f6a401e ccfff14361ea
comparison
equal deleted inserted replaced
18026:6e4bd4c906dc 18027:9f169829d0e1
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=20 38 HS_BUILD_NUMBER=21
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