comparison make/hotspot_version @ 20672:6bf89bfe8185 hs25.40-b21

Merge
author amurillo
date Thu, 27 Nov 2014 09:48:32 -0800
parents b62a321c4d2e
children dcccfe952e9b 9b4d6de0a838
comparison
equal deleted inserted replaced
20659:da381ecd299e 20672:6bf89bfe8185
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=40 37 HS_MINOR_VER=40
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