# HG changeset patch
# User ohair
# Date 1291661260 28800
# Node ID 501bf3acd89881c00d8b18e9566a5b266f4bfc33
# Parent  d75c4a1f136a257d37a8dec69821890b914cac5b
7001720: copyright templates not rebranded
Reviewed-by: mchung

diff -r d75c4a1f136a -r 501bf3acd898 jdk/make/templates/bsd-header
--- a/jdk/make/templates/bsd-header	Fri Dec 03 21:37:05 2010 -0800
+++ b/jdk/make/templates/bsd-header	Mon Dec 06 10:47:40 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.
+
diff -r d75c4a1f136a -r 501bf3acd898 jdk/make/templates/gpl-cp-header
--- a/jdk/make/templates/gpl-cp-header	Fri Dec 03 21:37:05 2010 -0800
+++ b/jdk/make/templates/gpl-cp-header	Mon Dec 06 10:47:40 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.
+
diff -r d75c4a1f136a -r 501bf3acd898 jdk/make/templates/gpl-header
--- a/jdk/make/templates/gpl-header	Fri Dec 03 21:37:05 2010 -0800
+++ b/jdk/make/templates/gpl-header	Mon Dec 06 10:47:40 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.
+