Mercurial > hg > truffle
comparison make/hotspot_version @ 7482:989155e2d07a
Merge with hs25-b15.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Jan 2013 01:34:24 +0100 |
parents | 291ffc492eb6 cd962e15c08e |
children | 3ac7d10a6572 |
comparison
equal
deleted
inserted
replaced
7381:6761a8f854a4 | 7482:989155e2d07a |
---|---|
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=12 | 38 HS_BUILD_NUMBER=15 |
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 |