Merge jdk8-b86

Tue, 16 Apr 2013 15:00:49 -0700

author
katleman
date
Tue, 16 Apr 2013 15:00:49 -0700
changeset 1684
6ab578e141df
parent 1681
1f19b84efa6d
parent 1683
717bcda533f2
child 1685
4f4509c2fe35
child 1700
cad4fc23f691

Merge

     1.1 --- a/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Tue Apr 16 08:16:07 2013 -0700
     1.2 +++ b/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Tue Apr 16 15:00:49 2013 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2009, 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
     2.1 --- a/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Tue Apr 16 08:16:07 2013 -0700
     2.2 +++ b/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Tue Apr 16 15:00:49 2013 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2009, 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
     3.1 --- a/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Tue Apr 16 08:16:07 2013 -0700
     3.2 +++ b/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Tue Apr 16 15:00:49 2013 -0700
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
     4.1 --- a/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Tue Apr 16 08:16:07 2013 -0700
     4.2 +++ b/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Tue Apr 16 15:00:49 2013 -0700
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it

mercurial