Mercurial > hg > truffle
diff make/hotspot_version @ 17524:89152779163c
Merge with jdk8-b132
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Wed, 15 Oct 2014 11:59:32 +0200 |
| parents | 02f27ecb4f3a 54f0c207dc35 |
| children | 562643f42b65 |
line wrap: on
line diff
--- a/make/hotspot_version Wed Oct 15 15:35:33 2014 +0200 +++ b/make/hotspot_version Wed Oct 15 11:59:32 2014 +0200 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -31,11 +31,11 @@ # # Don't put quotes (fail windows build). -HOTSPOT_VM_COPYRIGHT=Copyright 2013 +HOTSPOT_VM_COPYRIGHT=Copyright 2014 HS_MAJOR_VER=25 HS_MINOR_VER=0 -HS_BUILD_NUMBER=63 +HS_BUILD_NUMBER=70 JDK_MAJOR_VER=1 JDK_MINOR_VER=8