Mercurial > hg > graal-compiler
changeset 17532:e5561d89fe8b jdk8u5-b02
Merge
author | asaha |
---|---|
date | Fri, 20 Dec 2013 09:29:09 -0800 |
parents | 25a5a05cc40e (diff) ddff10b13587 (current diff) |
children | bf6415ab0f16 |
files | .hgtags make/hotspot_version |
diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Dec 20 07:41:07 2013 -0800 +++ b/.hgtags Fri Dec 20 09:29:09 2013 -0800 @@ -404,3 +404,4 @@ fca262db9c4309f99d2f5542ab0780e45c2f1578 jdk8-b120 41f4cad94c581034d4c427d2aaabcc20f26342d0 hs25-b63 5f07ec8bb982c48567693d3ef8bdfd4bdf1836d4 jdk8-b121 +4a35ef38e2a7bc64df20c7700ba69b37e3ddb8b5 jdk8u5-b01
--- a/.jcheck/conf Fri Dec 20 07:41:07 2013 -0800 +++ b/.jcheck/conf Fri Dec 20 09:29:09 2013 -0800 @@ -1,1 +1,2 @@ project=jdk8 +bugids=dup
--- a/make/hotspot_version Fri Dec 20 07:41:07 2013 -0800 +++ b/make/hotspot_version Fri Dec 20 09:29:09 2013 -0800 @@ -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_MINOR_VER=5 +HS_BUILD_NUMBER=01 JDK_MAJOR_VER=1 JDK_MINOR_VER=8