comparison make/hotspot_version @ 6909:218a94758fe7

Merge
author asaha
date Wed, 10 Oct 2012 14:28:08 -0700
parents 04ed664b7e30
children 1b582b1bf7cb
comparison
equal deleted inserted replaced
6908:5a3a6dac85e2 6909:218a94758fe7
31 # 31 #
32 32
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=24 36 HS_MAJOR_VER=25
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=22 38 HS_BUILD_NUMBER=03
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