comparison make/hotspot_version @ 17805:bbfbe9b06038

Merge
author kvn
date Thu, 13 Mar 2014 14:57:01 -0700
parents d8a0bb6f62a5
children 9d5e92af8f09 62c54fcc0a35
comparison
equal deleted inserted replaced
17804:fd1b9f02cc91 17805:bbfbe9b06038
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=04 38 HS_BUILD_NUMBER=05
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