Mercurial > hg > truffle
comparison make/templates/gpl-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. | 6 published by the Free Software Foundation. |
13 | 13 |
14 You should have received a copy of the GNU General Public License version | 14 You should have received a copy of the GNU General Public License version |
15 2 along with this work; if not, write to the Free Software Foundation, | 15 2 along with this work; if not, write to the Free Software Foundation, |
16 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | 16 Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
17 | 17 |
18 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, | 18 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
19 CA 95054 USA or visit www.sun.com if you need additional information or | 19 or visit www.oracle.com if you need additional information or have any |
20 have any questions. | 20 questions. |