Mercurial > hg > openjdk > jdk7
changeset 259:d94daa2acb2c
Merge
author | ohair |
---|---|
date | Thu, 16 Dec 2010 19:56:43 -0800 |
parents | d61adc5101e0 (current diff) 5be437606a75 (diff) |
children | f4c95f4b7590 |
files | |
diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/templates/bsd-header Thu Dec 16 18:17:42 2010 -0800 +++ b/make/templates/bsd-header Thu Dec 16 19:56:43 2010 -0800 @@ -1,4 +1,4 @@ -Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. +Copyright (c) %YEARS% Oracle and/or its affiliates. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -26,3 +26,4 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +
--- a/make/templates/gpl-cp-header Thu Dec 16 18:17:42 2010 -0800 +++ b/make/templates/gpl-cp-header Thu Dec 16 19:56:43 2010 -0800 @@ -1,4 +1,4 @@ -Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. +Copyright (c) %YEARS% 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 @@ -20,3 +20,4 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or visit www.oracle.com if you need additional information or have any questions. +
--- a/make/templates/gpl-header Thu Dec 16 18:17:42 2010 -0800 +++ b/make/templates/gpl-header Thu Dec 16 19:56:43 2010 -0800 @@ -1,4 +1,4 @@ -Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. +Copyright (c) %YEARS% 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 @@ -18,3 +18,4 @@ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA or visit www.oracle.com if you need additional information or have any questions. +