comparison make/hotspot_version @ 18011:4941bd9f6483

Merge
author asaha
date Wed, 04 Jun 2014 06:53:06 -0700
parents d6fcbd1e1075 abb06af6059b
children a96ae21442f6 e47c5dad18f2
comparison
equal deleted inserted replaced
18010:d6fcbd1e1075 18011:4941bd9f6483
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=16 38 HS_BUILD_NUMBER=17
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