diff options
| author | Glenn Morris | 2011-01-24 19:47:47 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-24 19:47:47 -0800 |
| commit | 06d8ace51597cd41e110560a56a1abeb6cce23d6 (patch) | |
| tree | e893bab169f27821637fc07e3cd2414b4b9b7b68 /nt | |
| parent | c5ecc7690d4afafb42049634d64abd781ff76642 (diff) | |
| parent | 0d19d4feaa653a315853716e64bbaddb210a26ca (diff) | |
| download | emacs-06d8ace51597cd41e110560a56a1abeb6cce23d6.tar.gz emacs-06d8ace51597cd41e110560a56a1abeb6cce23d6.zip | |
Merge from emacs-23.
Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/icons/README | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nt/icons/README b/nt/icons/README index 0d8d90ffefb..b9e56779c0e 100644 --- a/nt/icons/README +++ b/nt/icons/README | |||
| @@ -2,13 +2,13 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES | |||
| 2 | 2 | ||
| 3 | File: emacs.ico | 3 | File: emacs.ico |
| 4 | Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> | 4 | Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp> |
| 5 | Copyright (C) 2008, 2009 Free Software Foundation, Inc. | 5 | Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 6 | License: GNU General Public License version 3 or later | 6 | License: GNU General Public License version 3 or later |
| 7 | 7 | ||
| 8 | 8 | ||
| 9 | File: emacs22.ico | 9 | File: emacs22.ico |
| 10 | Author: Andrew Zhilin | 10 | Author: Andrew Zhilin |
| 11 | Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. | 11 | Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 12 | License: GNU General Public License version 3 or later (see COPYING) | 12 | License: GNU General Public License version 3 or later (see COPYING) |
| 13 | 13 | ||
| 14 | 14 | ||
| @@ -17,8 +17,8 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico | |||
| 17 | gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico | 17 | gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico |
| 18 | gnu7.ico gnu8.ico gnu9.ico | 18 | gnu7.ico gnu8.ico gnu9.ico |
| 19 | Author: Rob Davenport <rgd at bigfoot.com> | 19 | Author: Rob Davenport <rgd at bigfoot.com> |
| 20 | Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | 20 | Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, |
| 21 | Free Software Foundation, Inc. | 21 | 2010, 2011 Free Software Foundation, Inc. |
| 22 | License: GNU General Public License version 3 or later (see COPYING) | 22 | License: GNU General Public License version 3 or later (see COPYING) |
| 23 | 23 | ||
| 24 | <http://users.adelphia.net/~rob.davenport/gnuicons.html> | 24 | <http://users.adelphia.net/~rob.davenport/gnuicons.html> |