comparison make/hotspot_version @ 4137:04b9a2566eec

Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents e9b51b4bdcc7 cf4dd13bbcd3
children 33df1aeaebbf
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
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=21 36 HS_MAJOR_VER=23
37 HS_MINOR_VER=0 37 HS_MINOR_VER=0
38 HS_BUILD_NUMBER=17 38 HS_BUILD_NUMBER=08
39 39
40 JDK_MAJOR_VER=1 40 JDK_MAJOR_VER=1
41 JDK_MINOR_VER=7 41 JDK_MINOR_VER=8
42 JDK_MICRO_VER=0 42 JDK_MICRO_VER=0
43 43
44 # Previous (bootdir) JDK version 44 # Previous (bootdir) JDK version
45 JDK_PREVIOUS_VERSION=1.6.0 45 JDK_PREVIOUS_VERSION=1.7.0