comparison make/hotspot_version @ 17718:804f89b6ff46 hs25.20-b06

Merge
author amurillo
date Thu, 13 Mar 2014 09:57:31 -0700
parents 744553976af5
children 9d5e92af8f09 b4ce4e9eb97d db123bc329d0
comparison
equal deleted inserted replaced
17702:0c8d4e3b5c9a 17718:804f89b6ff46
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