comparison make/hotspot_version @ 17723:9d5e92af8f09

Merge
author lana
date Tue, 18 Mar 2014 12:40:54 -0700
parents d8a0bb6f62a5 744553976af5
children f0ea4d3df129
comparison
equal deleted inserted replaced
17722:556a5a987c41 17723:9d5e92af8f09
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=05 38 HS_BUILD_NUMBER=06
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