diff options
| author | Miles Bader <miles@gnu.org> | 2007-02-13 12:14:16 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-02-13 12:14:16 +0000 |
| commit | 18c36727661b0db59afb9311cd363902712b5f21 (patch) | |
| tree | 8af3ead70599b166c87c8d55d372590b7b50dea5 /etc/MORE.STUFF | |
| parent | 2658843ecafae493a461232249a53f86f85a10d8 (diff) | |
| parent | 409d26134b3de40bac01dffab971ed18014ae355 (diff) | |
| download | emacs-18c36727661b0db59afb9311cd363902712b5f21.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 624-636)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 200-201)
- Merge from emacs--devo--0
- Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-171
Diffstat (limited to 'etc/MORE.STUFF')
| -rw-r--r-- | etc/MORE.STUFF | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF index 8935baa1adb..3d5ee94ab86 100644 --- a/etc/MORE.STUFF +++ b/etc/MORE.STUFF @@ -1,7 +1,8 @@ More Neat Stuff for your Emacs + Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -Free Software Foundation, Inc. -See the end of the file for copying permissions. + Free Software Foundation, Inc. +See the end of the file for license conditions. This file describes GNU Emacs programs and resources that are maintained by other people. Some of these may become part of the @@ -272,12 +273,21 @@ mode: view eval: (goto-address) End: -COPYING PERMISSIONS - Permission to use, copy, modify, and distribute this - software and its documentation for any purpose and without - fee is hereby granted, provided that the above copyright - notice appear in all copies and that both that copyright - notice and this permission notice appear in supporting - documentation. +This file is part of GNU Emacs. + +GNU Emacs 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 Emacs 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 Emacs; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. arch-tag: c1d4e7c8-db85-44e6-909e-659e2b20fefa |