aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2011-05-23 13:04:51 +0200
committerMax Horn2011-05-23 13:04:51 +0200
commitd25363c6758f4a6bc787621e75385e74a556c9e3 (patch)
treea82b9f80f6f15143e07629c724278679e85aa963
parent808221a36fd8a3eff2172174e8998a9e068629c9 (diff)
downloadscummvm-rg350-d25363c6758f4a6bc787621e75385e74a556c9e3.tar.gz
scummvm-rg350-d25363c6758f4a6bc787621e75385e74a556c9e3.tar.bz2
scummvm-rg350-d25363c6758f4a6bc787621e75385e74a556c9e3.zip
BASE: Sync COPYING with latest version of the GPL 2.1 text
-rw-r--r--COPYING17
1 files changed, 8 insertions, 9 deletions
diff --git a/COPYING b/COPYING
index b6f92f3dbf..75a1ad8761 100644
--- a/COPYING
+++ b/COPYING
@@ -1,8 +1,8 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
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
-
+ 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.
Also add information on how to contact you by electronic and paper mail.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. \ No newline at end of file