aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2002-01-22 23:11:30 +0000
committerTom Tromey <tromey@gcc.gnu.org>2002-01-22 23:11:30 +0000
commit7f7cfc73b82c0aaff8735a8490b304bd1b6a7bb5 (patch)
tree52b44849c0cfa4fdc22b407531407b964e54dbe8 /libjava
parent4b9aaf6379db36f4ab90875a8aaef4e3c98269b7 (diff)
downloadgcc-7f7cfc73b82c0aaff8735a8490b304bd1b6a7bb5.zip
gcc-7f7cfc73b82c0aaff8735a8490b304bd1b6a7bb5.tar.gz
gcc-7f7cfc73b82c0aaff8735a8490b304bd1b6a7bb5.tar.bz2
* java/awt/GridBagConstraints.java: Updated copyright.
From-SVN: r49109
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/java/awt/GridBagConstraints.java37
2 files changed, 37 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index af995e4..41031d8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-22 Tom Tromey <tromey@redhat.com>
+
+ * java/awt/GridBagConstraints.java: Updated copyright.
+
2002-01-22 Mark Wielaard <mark@klomp.org>
* java/awt/Adjustable.java java/awt/CheckboxMenuItem.java
diff --git a/libjava/java/awt/GridBagConstraints.java b/libjava/java/awt/GridBagConstraints.java
index 27e6658..c91ed09 100644
--- a/libjava/java/awt/GridBagConstraints.java
+++ b/libjava/java/awt/GridBagConstraints.java
@@ -2,11 +2,40 @@
/* Copyright (C) 2000, 2001 Free Software Foundation
- This file is part of libgcj.
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
-This software is copyrighted work licensed under the terms of the
-Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
-details. */
package java.awt;