Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorduke
Wed, 05 Jul 2017 17:21:56 +0200
changeset 6389 0047c4cd496b
parent 6388 a74f1fdb0bb8 (diff)
parent 6385 c7861f01dce4 (current diff)
child 6390 a6442d6bc38a
Merge
--- a/langtools/.hgtags	Wed Jul 05 17:21:53 2017 +0200
+++ b/langtools/.hgtags	Wed Jul 05 17:21:56 2017 +0200
@@ -83,3 +83,4 @@
 112fcc00659dda1a356ec75d964584e4dae0228f jdk7-b106
 2c1c657f69a4ff608a43e1ac61baf3294cd55797 jdk7-b107
 a408ebb8b3d427dbb3d8ce153dfaeb060564a0a4 jdk7-b108
+4826378eaade4c6676c452efe954be4ee113cc11 jdk7-b109
--- a/langtools/test/tools/javac/generics/inference/6938454/T6938454a.java	Wed Jul 05 17:21:53 2017 +0200
+++ b/langtools/test/tools/javac/generics/inference/6938454/T6938454a.java	Wed Jul 05 17:21:56 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, 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
@@ -16,9 +16,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * 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/langtools/test/tools/javac/generics/inference/6938454/T6938454b.java	Wed Jul 05 17:21:53 2017 +0200
+++ b/langtools/test/tools/javac/generics/inference/6938454/T6938454b.java	Wed Jul 05 17:21:56 2017 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, 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
@@ -16,9 +16,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * 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.
  */
 
 import java.util.List;
jdk-sandbox