changeset 1709:da0bd69335d4

Merge
author lana
date Tue, 23 Apr 2013 15:09:12 -0700
parents bae8387d16aa 1329f9c38d93
children 4b0038f66d66
files
diffstat 5 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Apr 22 10:24:19 2013 +0200
+++ b/.hgtags	Tue Apr 23 15:09:12 2013 -0700
@@ -207,3 +207,4 @@
 22ba3f92d4ae43bbc19793e854171cae2586f644 jdk8-b83
 cfb65ca92082b2412aed66c8422c2466bde544ef jdk8-b84
 4a48f31735349782ad13980267358c97076adc66 jdk8-b85
+6ab578e141dfd17c4dc03869bb204aafa490c9f4 jdk8-b86
--- a/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Mon Apr 22 10:24:19 2013 +0200
+++ b/test/com/sun/javadoc/testAnnotationOptional/TestAnnotationOptional.java	Tue Apr 23 15:09:12 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
--- a/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Mon Apr 22 10:24:19 2013 +0200
+++ b/test/com/sun/javadoc/testAnnotationOptional/pkg/AnnotationOptional.java	Tue Apr 23 15:09:12 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
--- a/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Mon Apr 22 10:24:19 2013 +0200
+++ b/test/com/sun/javadoc/typeAnnotations/smoke/TestSmoke.java	Tue Apr 23 15:09:12 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Oracle and/or its affiliates. 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
--- a/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Mon Apr 22 10:24:19 2013 +0200
+++ b/test/com/sun/javadoc/typeAnnotations/smoke/pkg/TargetTypes.java	Tue Apr 23 15:09:12 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Oracle and/or its affiliates. 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