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/HELLO | |
| 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/HELLO')
| -rw-r--r-- | etc/HELLO | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/etc/HELLO b/etc/HELLO index d62838ebf09..3ee52f713b8 100644 --- a/etc/HELLO +++ b/etc/HELLO @@ -64,24 +64,24 @@ Korean ($(CGQ1[(B) $(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 -Free Software Foundation, Inc. + Free Software Foundation, Inc. -COPYING PERMISSIONS: +This file is part of GNU Emacs. - This document 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 of the License, or - (at your option) any later version. +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. - 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 St, Fifth Floor, Boston, MA 02110-1301 USA +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. ;;; Local Variables: ;;; tab-width: 32 |