comparison make/hotspot_version @ 6946:b4ee7b773144 hs25-b09

Merge
author amurillo
date Fri, 09 Nov 2012 08:20:03 -0800
parents ca8168203393
children e522a00b91aa 3be318ecfae5
comparison
equal deleted inserted replaced
6930:49bc14aaadcc 6946:b4ee7b773144
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=08 38 HS_BUILD_NUMBER=09
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