changeset 7512:978a95239044 jdk8-b97

Merge
author katleman
date Tue, 02 Jul 2013 15:55:55 -0700
parents 8339c83b16c6 87cab043cb5e
children 4b21dcfdcc3b 974b94f944ce 2c26ccf0a85b
files
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/makefiles/sun/awt/ToBin.java	Tue Jul 02 13:06:50 2013 +0200
+++ b/makefiles/sun/awt/ToBin.java	Tue Jul 02 15:55:55 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, 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/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java	Tue Jul 02 13:06:50 2013 +0200
+++ b/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java	Tue Jul 02 15:55:55 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, 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/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java	Tue Jul 02 13:06:50 2013 +0200
+++ b/test/java/awt/Mouse/EnterExitEvents/FullscreenEnterEventTest.java	Tue Jul 02 15:55:55 2013 -0700
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 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/java/lang/ThreadGroup/Suspend.java	Tue Jul 02 13:06:50 2013 +0200
+++ b/test/java/lang/ThreadGroup/Suspend.java	Tue Jul 02 15:55:55 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, 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