Mercurial > hg > truffle
diff make/hotspot_version @ 7682:5209cd031aec
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 04 Feb 2013 16:40:32 +0100 |
parents | 3ac7d10a6572 |
children | 5fc51c1ecdeb |
line wrap: on
line diff
--- a/make/hotspot_version Mon Feb 04 16:36:50 2013 +0100 +++ b/make/hotspot_version Mon Feb 04 16:40:32 2013 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2013, 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 2012 +HOTSPOT_VM_COPYRIGHT=Copyright 2013 HS_MAJOR_VER=25 HS_MINOR_VER=0 -HS_BUILD_NUMBER=15 +HS_BUILD_NUMBER=17 JDK_MAJOR_VER=1 JDK_MINOR_VER=8