comparison make/hotspot_version @ 7404:b6c9c0109a60 hs25-b13

Merge
author amurillo
date Fri, 14 Dec 2012 14:19:35 -0800
parents 4a2ed49abd51
children 1f323009c3ea
comparison
equal deleted inserted replaced
7395:8af7d22f1f8f 7404:b6c9c0109a60
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=12 38 HS_BUILD_NUMBER=13
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