comparison make/hotspot_version @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 04b9a2566eec 4ab89de75552
children 957c266d8bc5
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
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 2011 34 HOTSPOT_VM_COPYRIGHT=Copyright 2011
35 35
36 HS_MAJOR_VER=23 36 HS_MAJOR_VER=24
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=08 38 HS_BUILD_NUMBER=01
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