comparison make/hotspot_version @ 6858:b261523fe66c hs25-b05

Merge
author amurillo
date Fri, 12 Oct 2012 13:55:52 -0700
parents 81e878c53615
children 58fbf2da3c16
comparison
equal deleted inserted replaced
6829:0cc77f9b31ad 6858:b261523fe66c
33 # Don't put quotes (fail windows build). 33 # Don't put quotes (fail windows build).
34 HOTSPOT_VM_COPYRIGHT=Copyright 2012 34 HOTSPOT_VM_COPYRIGHT=Copyright 2012
35 35
36 HS_MAJOR_VER=25 36 HS_MAJOR_VER=25
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=04 38 HS_BUILD_NUMBER=05
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