Merge

Thu, 16 Dec 2010 19:56:43 -0800

author
ohair
date
Thu, 16 Dec 2010 19:56:43 -0800
changeset 261
d94daa2acb2c
parent 258
d61adc5101e0
parent 260
5be437606a75
child 262
f4c95f4b7590

Merge

     1.1 --- a/make/templates/bsd-header	Thu Dec 16 18:17:42 2010 -0800
     1.2 +++ b/make/templates/bsd-header	Thu Dec 16 19:56:43 2010 -0800
     1.3 @@ -1,4 +1,4 @@
     1.4 -Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
     1.5 +Copyright (c) %YEARS% Oracle and/or its affiliates. All rights reserved.
     1.6  
     1.7  Redistribution and use in source and binary forms, with or without
     1.8  modification, are permitted provided that the following conditions
     1.9 @@ -26,3 +26,4 @@
    1.10  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
    1.11  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    1.12  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    1.13 +
     2.1 --- a/make/templates/gpl-cp-header	Thu Dec 16 18:17:42 2010 -0800
     2.2 +++ b/make/templates/gpl-cp-header	Thu Dec 16 19:56:43 2010 -0800
     2.3 @@ -1,4 +1,4 @@
     2.4 -Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
     2.5 +Copyright (c) %YEARS% Oracle and/or its affiliates. All rights reserved.
     2.6  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7  
     2.8  This code is free software; you can redistribute it and/or modify it
     2.9 @@ -20,3 +20,4 @@
    2.10  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.11  or visit www.oracle.com if you need additional information or have any
    2.12  questions.
    2.13 +
     3.1 --- a/make/templates/gpl-header	Thu Dec 16 18:17:42 2010 -0800
     3.2 +++ b/make/templates/gpl-header	Thu Dec 16 19:56:43 2010 -0800
     3.3 @@ -1,4 +1,4 @@
     3.4 -Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
     3.5 +Copyright (c) %YEARS% Oracle and/or its affiliates. All rights reserved.
     3.6  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7  
     3.8  This code is free software; you can redistribute it and/or modify it
     3.9 @@ -18,3 +18,4 @@
    3.10  Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.11  or visit www.oracle.com if you need additional information or have any
    3.12  questions.
    3.13 +

mercurial