Mercurial > hg > graal-compiler
diff make/hotspot_version @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | c38f13903fdf ca8168203393 |
| children | 2cb439954abf |
line wrap: on
line diff
--- a/make/hotspot_version Mon Nov 12 18:11:17 2012 +0100 +++ b/make/hotspot_version Mon Nov 12 23:14:12 2012 +0100 @@ -33,9 +33,9 @@ # Don't put quotes (fail windows build). HOTSPOT_VM_COPYRIGHT=Copyright 2012 -HS_MAJOR_VER=24 +HS_MAJOR_VER=25 HS_MINOR_VER=0 -HS_BUILD_NUMBER=22 +HS_BUILD_NUMBER=09 JDK_MAJOR_VER=1 JDK_MINOR_VER=8