Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/make/hotspot_version Sat Dec 17 20:50:09 2011 +0100 +++ b/make/hotspot_version Sat Dec 17 21:40:27 2011 +0100 @@ -33,13 +33,13 @@ # Don't put quotes (fail windows build). HOTSPOT_VM_COPYRIGHT=Copyright 2011 -HS_MAJOR_VER=21 +HS_MAJOR_VER=23 HS_MINOR_VER=0 -HS_BUILD_NUMBER=17 +HS_BUILD_NUMBER=08 JDK_MAJOR_VER=1 -JDK_MINOR_VER=7 +JDK_MINOR_VER=8 JDK_MICRO_VER=0 # Previous (bootdir) JDK version -JDK_PREVIOUS_VERSION=1.6.0 +JDK_PREVIOUS_VERSION=1.7.0