Mercurial > hg > jdk9-shenandoah > langtools
changeset 334:95c1212b07e3 jdk7-b68
Merge
author | tbell |
---|---|
date | Thu, 30 Jul 2009 23:41:19 -0700 |
parents | e4ce529b2249 (current diff) 689bec60a482 (diff) |
children | ce9bcdcb7859 dbf8a2816201 |
files | |
diffstat | 9 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 27 23:07:00 2009 -0700 +++ b/.hgtags Thu Jul 30 23:41:19 2009 -0700 @@ -41,3 +41,4 @@ d8f23a81d46f47a4186f1044dd9e44841bbeab84 jdk7-b64 7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65 634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66 +14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67
--- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Mon Jul 27 23:07:00 2009 -0700 +++ b/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Thu Jul 30 23:41:19 2009 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2003-2009 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/javac/comp/Lower.java Mon Jul 27 23:07:00 2009 -0700 +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Jul 30 23:41:19 2009 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1999-2009 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Mon Jul 27 23:07:00 2009 -0700 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Jul 30 23:41:19 2009 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1999-2009 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/javac/jvm/Code.java Mon Jul 27 23:07:00 2009 -0700 +++ b/src/share/classes/com/sun/tools/javac/jvm/Code.java Thu Jul 30 23:41:19 2009 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1999-2009 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java Mon Jul 27 23:07:00 2009 -0700 +++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Jul 30 23:41:19 2009 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 1999-2009 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Mon Jul 27 23:07:00 2009 -0700 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Jul 30 23:41:19 2009 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2005-2009 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/javac/resources/legacy.properties Mon Jul 27 23:07:00 2009 -0700 +++ b/src/share/classes/com/sun/tools/javac/resources/legacy.properties Thu Jul 30 23:41:19 2009 -0700 @@ -1,5 +1,5 @@ # -# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2006-2009 Sun Microsystems, Inc. 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
--- a/test/tools/javac/typeAnnotations/failures/OldArray.java Mon Jul 27 23:07:00 2009 -0700 +++ b/test/tools/javac/typeAnnotations/failures/OldArray.java Thu Jul 30 23:41:19 2009 -0700 @@ -1,5 +1,5 @@ /* - * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2008-2009 Sun Microsystems, Inc. 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