Merge from origin/emacs-24

[gnu-emacs] / etc / images / mail / README

diff --git a/etc/images/mail/README b/etc/images/mail/README
index c7fcecc68858232a778edf1750a36c052e16f2e3..279e9cc5723cdf7dc34a0d42b71cc12663b97ba2 100644 (file)
--- a/etc/images/mail/README
+++ b/etc/images/mail/README
@@ -1,14 +1,9 @@
-COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
+COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES -*- coding: utf-8 -*-
 
 The following icons are from GNOME 2.x. They are not part of Emacs,
-but distributed and used by Emacs.
-
-  Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
-  Tuomas Kuosmanen, Rodney Dawes, Jakub Steiner, Alexander Larsson,
-  Tor Lillqvist, Garrett LeSage, Dennis Cranston, Jody Goldberg, Luca
-  Ferretti, Mark Finlay, Lapo Calamandrei, Andreas Nilsson and Marco
-  Pesenti Gritti
-  License: GNU General Public License version 2
+but are distributed and used by Emacs.  They are licensed under the
+GNU General Public License version 2 or later.  See the source of the
+gnome-icons-theme package for more information.
 
 Emacs images and their GNOME source (GNOME icons are from stock/net/
 directory unless otherwise stated):
@@ -30,7 +25,7 @@ save.xpm                    combines stock_mail, io/stock_save and
 send.xpm                    stock_mail-send
 spam.xpm                    stock_spam
 
-(preview and save were contributed by Adam Sjøgren <asjo@koldfront.dk>)
+(preview and save were contributed by Adam Sjøgren <asjo@koldfront.dk>)
 
 repack is a slightly modified version of package-x-generic.
 reply-from is a slightly modified version of reply.