diff options
| author | Glenn Morris | 2007-11-09 04:02:15 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-11-09 04:02:15 +0000 |
| commit | 1da7a8c539f30cae62d116903e8fd0ecb0fefbff (patch) | |
| tree | 5a9291e669aec88f9c02c5cc25d2446ef3100d0e | |
| parent | 67932d94602d81049464329e40b4b6358b3a2313 (diff) | |
| download | emacs-1da7a8c539f30cae62d116903e8fd0ecb0fefbff.tar.gz emacs-1da7a8c539f30cae62d116903e8fd0ecb0fefbff.zip | |
Revert previous change - merge mistake.
| -rw-r--r-- | etc/README | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/etc/README b/etc/README index 16e0923487d..e18da7f381a 100644 --- a/etc/README +++ b/etc/README | |||
| @@ -10,35 +10,8 @@ for Emacs functions and variables. | |||
| 10 | 10 | ||
| 11 | COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES | 11 | COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES |
| 12 | 12 | ||
| 13 | The files splash.xpm, splash8.xpm contain copyright and license | ||
| 14 | information, but it is reproduced here for convenience. | ||
| 15 | |||
| 16 | Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm, gnus-logo.eps | ||
| 17 | Author: Luis Fernandes <elf@ee.ryerson.ca> | ||
| 18 | Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 | ||
| 19 | Free Software Foundation, Inc. | ||
| 20 | License: GNU General Public License version 3 or later (see COPYING) | ||
| 21 | |||
| 22 | File: emacs.icon | 13 | File: emacs.icon |
| 23 | Author: Sun Microsystems, Inc | 14 | Author: Sun Microsystems, Inc |
| 24 | Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 | 15 | Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 |
| 25 | Free Software Foundation, Inc. | 16 | Free Software Foundation, Inc. |
| 26 | License: GNU General Public License version 3 or later (see COPYING) | 17 | License: GNU General Public License version 3 or later (see COPYING) |
| 27 | |||
| 28 | |||
| 29 | This file is part of GNU Emacs. | ||
| 30 | |||
| 31 | GNU Emacs is free software; you can redistribute it and/or modify | ||
| 32 | it under the terms of the GNU General Public License as published by | ||
| 33 | the Free Software Foundation; either version 3, or (at your option) | ||
| 34 | any later version. | ||
| 35 | |||
| 36 | GNU Emacs is distributed in the hope that it will be useful, | ||
| 37 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 38 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 39 | GNU General Public License for more details. | ||
| 40 | |||
| 41 | You should have received a copy of the GNU General Public License | ||
| 42 | along with GNU Emacs; see the file COPYING. If not, write to the | ||
| 43 | Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 44 | Boston, MA 02110-1301, USA. | ||