Merge

Wed, 24 Apr 2013 11:03:32 +0100

author
chegar
date
Wed, 24 Apr 2013 11:03:32 +0100
changeset 1827
4d4818b6df72
parent 1709
bae8387d16aa
parent 1701
1329f9c38d93
child 1828
27cda5134748

Merge

     1.1 --- a/.hgtags	Mon Apr 22 10:24:19 2013 +0200
     1.2 +++ b/.hgtags	Wed Apr 24 11:03:32 2013 +0100
     1.3 @@ -207,3 +207,4 @@
     1.4  22ba3f92d4ae43bbc19793e854171cae2586f644 jdk8-b83
     1.5  cfb65ca92082b2412aed66c8422c2466bde544ef jdk8-b84
     1.6  4a48f31735349782ad13980267358c97076adc66 jdk8-b85
     1.7 +6ab578e141dfd17c4dc03869bb204aafa490c9f4 jdk8-b86
     2.1 --- a/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Mon Apr 22 10:24:19 2013 +0200
     2.2 +++ b/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Wed Apr 24 11:03:32 2013 +0100
     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/testAnnotationOptional/pkg/AnnotationOptional.java	Mon Apr 22 10:24:19 2013 +0200
     3.2 +++ b/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Wed Apr 24 11:03:32 2013 +0100
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2009, 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/TestSmoke.java	Mon Apr 22 10:24:19 2013 +0200
     4.2 +++ b/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Wed Apr 24 11:03:32 2013 +0100
     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
     5.1 --- a/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Mon Apr 22 10:24:19 2013 +0200
     5.2 +++ b/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Wed Apr 24 11:03:32 2013 +0100
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it

mercurial