Merge from emacs-23

[bpt/emacs.git] / etc / images / icons / README

diff --git a/etc/images/icons/README b/etc/images/icons/README
dissimilarity index 64%
index ec20a6d..3ebc42c 100644 (file)
--- a/etc/images/icons/README
+++ b/etc/images/icons/README
@@ -1,6 +1,17 @@
-COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
-
-Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
-Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
-Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
-License: GNU General Public License version 2 or later (see COPYING)
+COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
+
+Files: hicolor/16x16/apps/emacs.png hicolor/24x24/apps/emacs.png
+       hicolor/32x32/apps/emacs.png hicolor/48x48/apps/emacs.png
+       hicolor/128x128/apps/emacs.png hicolor/scalable/apps/emacs.svg
+
+Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
+Copyright (C) 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+License: GNU General Public License version 3 or later (see COPYING)
+
+
+Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png
+       hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png
+
+Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
+Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+License: GNU General Public License version 3 or later (see COPYING)