Merge from emacs--devo--0

[gnus] / etc / images / README

diff --git a/etc/images/README b/etc/images/README
index b3271ae..865984e 100644 (file)
--- a/etc/images/README
+++ b/etc/images/README
@@ -16,22 +16,24 @@ Thanks to jan.h.d@swipnet.se for the help.
 
 COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
 
-* The following icons are a part of Emacs:
+* The following icons are part of Emacs.  All are licensed under the
+  GNU General Public License version 3 (see COPYING) or later.
+  The xpm and svg files contain copyright and license information, but
+  it is reproduced here for convenience.  
 
 File: mh-logo.xpm
-Author: Satyaki Das
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
-  Free Software Foundation, Inc.
-License: GNU General Public License version 3 or later (see COPYING)
-
-The files splash.xpm, splash8.xpm contain copyright and license
-information, but it is reproduced here for convenience.
+  Author: Satyaki Das
+  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+    Free Software Foundation, Inc.
 
-Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm
+Files: splash.pbm, splash.xpm, gnus.pbm
   Author: Luis Fernandes <elf@ee.ryerson.ca>
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
     Free Software Foundation, Inc.
-  License: GNU General Public License version 3 or later (see COPYING)
+
+Files: splash.png, splash.svg
+  Author: Francesc Rocher <rocher@member.fsf.org>
+  Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 
 
 * The following icons are from GTK+ 2.x. They are not part of Emacs, but
@@ -57,6 +59,7 @@ the gnome-icons-theme package for more information.
 Emacs images and their source in the GNOME icons stock/ directory:
 
   attach.xpm                document/stock_attach
+  bookmark_add.xpm          actions/bookmark_add
   cancel.xpm                slightly modified generic/stock_stop
   connect.xpm               net/stock_connect
   contact.xpm               net/stock_contact