comparison make/hotspot_version @ 20369:3f1b3f2dd1cb hs25.40-b08

Merge
author amurillo
date Thu, 28 Aug 2014 14:00:20 -0700
parents 5b662570d9cf
children fd4dbaff3002 c67b85c32d9a
comparison
equal deleted inserted replaced
20342:0ee2b6c618fc 20369:3f1b3f2dd1cb
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=06 38 HS_BUILD_NUMBER=08
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