Mercurial > hg > graal-compiler
changeset 20728:31845bc861c5
Merge
author | coffeys |
---|---|
date | Thu, 07 Aug 2014 12:23:34 +0100 |
parents | 6e7f1382ca62 (diff) 2993491d47df (current diff) |
children | 609faa407cfd |
files | .hgtags |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Aug 02 16:28:59 2014 -0400 +++ b/.hgtags Thu Aug 07 12:23:34 2014 +0100 @@ -513,3 +513,4 @@ 4f209b7a580c78bac255e69f4724c42584c32a7d jdk8u25-b09 19c692f1e4c571a9285e33e7d3d15948769fcbdd jdk8u25-b10 9e2bb00a81910776d5b16c49a3f4c5264ceab522 jdk8u25-b11 +5bb683bbe2c74876d585b5c3232fc3aab7b23e97 jdk8u31-b00
--- a/make/hotspot_version Sat Aug 02 16:28:59 2014 -0400 +++ b/make/hotspot_version Thu Aug 07 12:23:34 2014 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2015, 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,10 +31,10 @@ # # Don't put quotes (fail windows build). -HOTSPOT_VM_COPYRIGHT=Copyright 2014 +HOTSPOT_VM_COPYRIGHT=Copyright 2015 HS_MAJOR_VER=25 -HS_MINOR_VER=25 +HS_MINOR_VER=31 HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1