Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 7256:c63eda8f6300 jdk8-b90
Merge
author | katleman |
---|---|
date | Tue, 14 May 2013 12:19:39 -0700 |
parents | b8e7d145abc2 (current diff) 1f1699686504 (diff) |
children | 08c28cdacd7b 2868607646a0 b8102c2f6632 c171bff33af5 |
files | |
diffstat | 4 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/Base64.java Thu May 09 10:04:20 2013 -0700 +++ b/src/share/classes/java/util/Base64.java Tue May 14 12:19:39 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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
--- a/src/share/classes/java/util/StringJoiner.java Thu May 09 10:04:20 2013 -0700 +++ b/src/share/classes/java/util/StringJoiner.java Tue May 14 12:19:39 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 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
--- a/test/java/lang/CharSequence/DefaultTest.java Thu May 09 10:04:20 2013 -0700 +++ b/test/java/lang/CharSequence/DefaultTest.java Tue May 14 12:19:39 2013 -0700 @@ -1,12 +1,10 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. + * published by the Free Software Foundation. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--- a/test/java/util/StringJoiner/StringJoinerTest.java Thu May 09 10:04:20 2013 -0700 +++ b/test/java/util/StringJoiner/StringJoinerTest.java Tue May 14 12:19:39 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 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