Merge jdk8-b70

Wed, 26 Dec 2012 14:23:58 -0800

author
katleman
date
Wed, 26 Dec 2012 14:23:58 -0800
changeset 366
6ec9edffc286
parent 364
27421008f050
parent 365
a72c8391cdd6
child 367
63815efd132f
child 376
278a2f60c55b

Merge

     1.1 --- a/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Thu Dec 20 09:18:07 2012 -0800
     1.2 +++ b/src/com/sun/org/apache/xalan/internal/XalanConstants.java	Wed Dec 26 14:23:58 2012 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
     2.1 --- a/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java	Thu Dec 20 09:18:07 2012 -0800
     2.2 +++ b/src/com/sun/org/apache/xalan/internal/utils/FactoryImpl.java	Wed Dec 26 14:23:58 2012 -0800
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2011, 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

mercurial