comparison make/templates/gpl-cp-header @ 1930:2d26b0046e0d

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 14:53:30 +0100
parents b2045e0af26e
children
comparison
equal deleted inserted replaced
1484:6b7001391c97 1930:2d26b0046e0d
1 Copyright %YEARS% Sun Microsystems, Inc. All Rights Reserved. 1 Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
2 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3 3
4 This code is free software; you can redistribute it and/or modify it 4 This code is free software; you can redistribute it and/or modify it
5 under the terms of the GNU General Public License version 2 only, as 5 under the terms of the GNU General Public License version 2 only, as
6 published by the Free Software Foundation. Sun designates this 6 published by the Free Software Foundation. Oracle designates this
7 particular file as subject to the "Classpath" exception as provided 7 particular file as subject to the "Classpath" exception as provided
8 by Sun in the LICENSE file that accompanied this code. 8 by Oracle in the LICENSE file that accompanied this code.
9 9
10 This code is distributed in the hope that it will be useful, but WITHOUT 10 This code is distributed in the hope that it will be useful, but WITHOUT
11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
13 version 2 for more details (a copy is included in the LICENSE file that 13 version 2 for more details (a copy is included in the LICENSE file that
15 15
16 You should have received a copy of the GNU General Public License version 16 You should have received a copy of the GNU General Public License version
17 2 along with this work; if not, write to the Free Software Foundation, 17 2 along with this work; if not, write to the Free Software Foundation,
18 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 18 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
19 19
20 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 20 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
21 CA 95054 USA or visit www.sun.com if you need additional information or 21 or visit www.oracle.com if you need additional information or have any
22 have any questions. 22 questions.