Merge

Thu, 11 Jul 2013 14:33:54 -0700

author
katleman
date
Thu, 11 Jul 2013 14:33:54 -0700
changeset 5394
1c474723a324
parent 5360
1a3390aa8326
parent 5393
dc8afa03e5c9
child 5395
81b6cb70717c

Merge

     1.1 --- a/test/runtime/8001071/Test8001071.sh	Thu Jul 11 10:13:37 2013 -0700
     1.2 +++ b/test/runtime/8001071/Test8001071.sh	Thu Jul 11 14:33:54 2013 -0700
     1.3 @@ -2,21 +2,21 @@
     1.4  
     1.5  # Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     1.6  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.7 -
     1.8 +#
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10  # under the terms of the GNU General Public License version 2 only, as
    1.11  # published by the Free Software Foundation.
    1.12 -
    1.13 +#
    1.14  # This code is distributed in the hope that it will be useful, but WITHOUT
    1.15  # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.16  # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1.17  # version 2 for more details (a copy is included in the LICENSE file that
    1.18  # accompanied this code).
    1.19 -
    1.20 +#
    1.21  # You should have received a copy of the GNU General Public License version
    1.22  # 2 along with this work; if not, write to the Free Software Foundation,
    1.23  # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.24 -
    1.25 +#
    1.26  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.27  # or visit www.oracle.com if you need additional information or have any
    1.28  # questions.

mercurial