diff options
| author | DJ Delorie <dj@redhat.com> | 2007-04-26 03:13:46 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2007-04-26 03:13:46 +0000 |
| commit | e8590c10490b01c5fef8701b15b3eadcb8fa2ef6 (patch) | |
| tree | bf7811f3c7425dfb57e82194bae1ac274213877d | |
| parent | b02f9d57327dbea7322242fb23f3040d5376acec (diff) | |
| download | fsf-binutils-gdb-e8590c10490b01c5fef8701b15b3eadcb8fa2ef6.zip fsf-binutils-gdb-e8590c10490b01c5fef8701b15b3eadcb8fa2ef6.tar.gz fsf-binutils-gdb-e8590c10490b01c5fef8701b15b3eadcb8fa2ef6.tar.bz2 | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/demangle.h | 37 |
2 files changed, 27 insertions, 14 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index bdf92bb..68ea476 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2007-04-25 Mark Mitchell <mark@codesourcery.com> + + * demangle.h: Change license to LGPL + exception. + 2007-04-10 Richard Henderson <rth@redhat.com> * bfdlink.h (struct bfd_link_info): Add relax_trip. diff --git a/include/demangle.h b/include/demangle.h index 360538c..49f23e5 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -2,20 +2,29 @@ Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. - This program 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. - - This program 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 this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street - Fifth Floor, - Boston, MA 02110-1301, USA. */ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License + as published by the Free Software Foundation; either version 2, or + (at your option) any later version. + + In addition to the permissions in the GNU Library General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file into + combinations with other programs, and to distribute those + combinations without any restriction coming from the use of this + file. (The Library Public License restrictions do apply in other + respects; for example, they cover modification of the file, and + distribution when not linked into a combined executable.) + + This program 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ #if !defined (DEMANGLE_H) |