Merge jdk7-b110

Wed, 15 Sep 2010 13:41:14 -0700

author
cl
date
Wed, 15 Sep 2010 13:41:14 -0700
changeset 651
32da0f38d2fe
parent 649
1c13c5ea73b5
parent 650
b599cc9a9c22
child 652
8bec624274ef
child 684
c5df455918c4

Merge

     1.1 --- a/test/tools/javac/generics/inference/6938454/T6938454a.java	Thu Sep 09 15:08:03 2010 -0700
     1.2 +++ b/test/tools/javac/generics/inference/6938454/T6938454a.java	Wed Sep 15 13:41:14 2010 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
     1.6 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -16,9 +16,9 @@
    1.11   * 2 along with this work; if not, write to the Free Software Foundation,
    1.12   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.13   *
    1.14 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    1.15 - * CA 95054 USA or visit www.sun.com if you need additional information or
    1.16 - * have any questions.
    1.17 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.18 + * or visit www.oracle.com if you need additional information or have any
    1.19 + * questions.
    1.20   */
    1.21  
    1.22  /*
     2.1 --- a/test/tools/javac/generics/inference/6938454/T6938454b.java	Thu Sep 09 15:08:03 2010 -0700
     2.2 +++ b/test/tools/javac/generics/inference/6938454/T6938454b.java	Wed Sep 15 13:41:14 2010 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
     2.6 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10 @@ -16,9 +16,9 @@
    2.11   * 2 along with this work; if not, write to the Free Software Foundation,
    2.12   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.13   *
    2.14 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    2.15 - * CA 95054 USA or visit www.sun.com if you need additional information or
    2.16 - * have any questions.
    2.17 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.18 + * or visit www.oracle.com if you need additional information or have any
    2.19 + * questions.
    2.20   */
    2.21  
    2.22  import java.util.List;

mercurial