Mercurial > emacs
changeset 85971:2e692f327278
Revert previous change - merge mistake.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 09 Nov 2007 04:02:15 +0000 |
| parents | c73d915c130c |
| children | 51aa47312c4b |
| files | etc/README |
| diffstat | 1 files changed, 0 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/README Thu Nov 08 20:15:25 2007 +0000 +++ b/etc/README Fri Nov 09 04:02:15 2007 +0000 @@ -10,35 +10,8 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES -The files splash.xpm, splash8.xpm contain copyright and license -information, but it is reproduced here for convenience. - -Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm, gnus-logo.eps - Author: Luis Fernandes <elf@ee.ryerson.ca> - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. - License: GNU General Public License version 3 or later (see COPYING) - File: emacs.icon Author: Sun Microsystems, Inc Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) - - -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 3, 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.