changeset 410:499be952a291 jdk8-b71

Merge
author lana
date Fri, 28 Dec 2012 18:31:52 -0800
parents 63815efd132f (diff) d4aea0225e80 (current diff)
children bdf2af722a6b 47738fa4d411
files
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Dec 27 18:17:58 2012 -0800
+++ b/.hgtags	Fri Dec 28 18:31:52 2012 -0800
@@ -190,3 +190,5 @@
 e6af1ad464e3d9b1154b9f9ed9a5373b97d129fc jdk8-b66
 83df3493ca3cf0be077f1d0dd90119456f266f54 jdk8-b67
 b854e70084214e9dcf1b37373f6e4b1a68760e03 jdk8-b68
+789a855de959f7e9600e57759c6c3dbb0b24d78b jdk8-b69
+6ec9edffc286c9c9ac96c9cd2050b01cb5d514a8 jdk8-b70
--- a/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Thu Dec 27 18:17:58 2012 -0800
+++ b/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Fri Dec 28 18:31:52 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/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java	Thu Dec 27 18:17:58 2012 -0800
+++ b/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java	Fri Dec 28 18:31:52 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