Mercurial > hg > release > icedtea7-forest-2.0 > langtools
changeset 716:827d87221959
Merge
author | lana |
---|---|
date | Sat, 25 Sep 2010 12:02:32 -0700 |
parents | 3eea38ce151c (current diff) fd2579b80b83 (diff) |
children | f6fe12839a8a |
files | |
diffstat | 3 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Sep 22 12:53:26 2010 -0700 +++ b/.hgtags Sat Sep 25 12:02:32 2010 -0700 @@ -82,3 +82,7 @@ aaecac256d39c7cb536e70d20ddd833fc118e43a jdk7-b105 112fcc00659dda1a356ec75d964584e4dae0228f jdk7-b106 2c1c657f69a4ff608a43e1ac61baf3294cd55797 jdk7-b107 +a408ebb8b3d427dbb3d8ce153dfaeb060564a0a4 jdk7-b108 +4826378eaade4c6676c452efe954be4ee113cc11 jdk7-b109 +32da0f38d2fe96c558492b8707b40da24643d41e jdk7-b110 +8bec624274ef8535720cff553374347c2f4f5fb2 jdk7-b111
--- a/test/tools/javac/generics/inference/6938454/T6938454a.java Wed Sep 22 12:53:26 2010 -0700 +++ b/test/tools/javac/generics/inference/6938454/T6938454a.java Sat Sep 25 12:02:32 2010 -0700 @@ -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/test/tools/javac/generics/inference/6938454/T6938454b.java Wed Sep 22 12:53:26 2010 -0700 +++ b/test/tools/javac/generics/inference/6938454/T6938454b.java Sat Sep 25 12:02:32 2010 -0700 @@ -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;