Merge
authorkatleman
Wed, 26 Dec 2012 14:23:58 -0800
changeset 14865 6ca279338b6b
parent 14863 dbaaf66c0a5b (current diff)
parent 14864 ede328b35431 (diff)
child 14866 e4fb4b6f4f9d
Merge
--- a/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Thu Dec 20 09:18:07 2012 -0800
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Wed Dec 26 14:23:58 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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/jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java	Thu Dec 20 09:18:07 2012 -0800
+++ b/jaxp/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java	Wed Dec 26 14:23:58 2012 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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