diff options
| author | Glenn Morris | 2007-02-16 01:20:46 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-02-16 01:20:46 +0000 |
| commit | c14693e3c3a019e66983f5a6ff2b08a56dfa5155 (patch) | |
| tree | bb7b81195b77cfb88ae0f6075dd9698c325c0fc2 | |
| parent | 8e127f9981965f901aff0ac0c3f9a8b023937c3d (diff) | |
| download | emacs-c14693e3c3a019e66983f5a6ff2b08a56dfa5155.tar.gz emacs-c14693e3c3a019e66983f5a6ff2b08a56dfa5155.zip | |
*** empty log message ***
| -rw-r--r-- | admin/notes/copyright | 23 | ||||
| -rw-r--r-- | etc/images/mail/README | 6 | ||||
| -rw-r--r-- | nt/ChangeLog | 9 | ||||
| -rw-r--r-- | nt/icons/README | 18 |
4 files changed, 43 insertions, 13 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright index e1e01a166a9..2def2ffcf3c 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -156,6 +156,14 @@ WHY-FREE | |||
| 156 | etc/MAILINGLISTS | 156 | etc/MAILINGLISTS |
| 157 | rms: simple license is fine for this file | 157 | rms: simple license is fine for this file |
| 158 | 158 | ||
| 159 | etc/images/icons/* | ||
| 160 | nt/icons/emacs21.ico | ||
| 161 | src/gnu.h | ||
| 162 | Note that Andrew Zhilin has a copyright assignment on file (confirmed | ||
| 163 | by fsf-records), even though it doesn't seem to show up in | ||
| 164 | copyright.list for some reason (at time of writing, 2007/02). | ||
| 165 | http://lists.gnu.org/archive/html/emacs-devel/2005-11/msg00349.html | ||
| 166 | |||
| 159 | leim/CXTERM-DIC/4Corner.tit, ARRAY30.tit, CCDOSPY.tit, ECDICT.tit, | 167 | leim/CXTERM-DIC/4Corner.tit, ARRAY30.tit, CCDOSPY.tit, ECDICT.tit, |
| 160 | ETZY.tit, PY-b5.tit, Punct-b5.tit, Punct.tit, QJ-b5.tit, QJ.tit, | 168 | ETZY.tit, PY-b5.tit, Punct-b5.tit, Punct.tit, QJ-b5.tit, QJ.tit, |
| 161 | SW.tit, TONEPY.tit, ZOZY.tit | 169 | SW.tit, TONEPY.tit, ZOZY.tit |
| @@ -235,14 +243,6 @@ etc/BABYL | |||
| 235 | assignment. RMS: "The lawyer said we can keep BABYL." | 243 | assignment. RMS: "The lawyer said we can keep BABYL." |
| 236 | 244 | ||
| 237 | 245 | ||
| 238 | etc/images/icons/* | ||
| 239 | nt/icons/emacs21.ico | ||
| 240 | src/gnu.h | ||
| 241 | Has Andrew Zhilin's 2005-11 assignment been correctly noted in | ||
| 242 | copyright.list? Mail sent to fsf-records. | ||
| 243 | http://lists.gnu.org/archive/html/emacs-devel/2005-11/msg00349.html | ||
| 244 | |||
| 245 | |||
| 246 | REMOVED etc/orgcard.tex, orgcard.ps | 246 | REMOVED etc/orgcard.tex, orgcard.ps |
| 247 | Re-add these files if an assignment is received from Rooke. | 247 | Re-add these files if an assignment is received from Rooke. |
| 248 | 248 | ||
| @@ -310,9 +310,10 @@ etc/e/eterm-color.ti - no copyright | |||
| 310 | US; I am not sure whether we can rely on that in general." | 310 | US; I am not sure whether we can rely on that in general." |
| 311 | 311 | ||
| 312 | 312 | ||
| 313 | etc/TUTORIAL* | 313 | etc/TUTORIAL* (translations) |
| 314 | switch to GPL. Depending on how rms wants this done, this may | 314 | switch to GPL (see english TUTORIAL) |
| 315 | require the translators. | 315 | rms: "We can leave the TUTORIAL translations alone until their |
| 316 | maintainers update them." | ||
| 316 | 317 | ||
| 317 | 318 | ||
| 318 | lib-src/etags.c - no 'k.* arnold' in copyright.list' | 319 | lib-src/etags.c - no 'k.* arnold' in copyright.list' |
diff --git a/etc/images/mail/README b/etc/images/mail/README index 02ef3678467..32612058042 100644 --- a/etc/images/mail/README +++ b/etc/images/mail/README | |||
| @@ -21,14 +21,16 @@ inbox.xpm stock_inbox | |||
| 21 | move.xpm stock_mail-move | 21 | move.xpm stock_mail-move |
| 22 | not-spam.xpm stock_not-spam | 22 | not-spam.xpm stock_not-spam |
| 23 | outbox.xpm stock_outbox | 23 | outbox.xpm stock_outbox |
| 24 | preview.xpm ? | 24 | preview.xpm combines stock_mail and navigation/stock_zoom |
| 25 | reply-all.xpm stock_mail-reply-to-all | 25 | reply-all.xpm stock_mail-reply-to-all |
| 26 | reply.xpm stock_mail-reply | 26 | reply.xpm stock_mail-reply |
| 27 | save-draft.xpm stock_mail-handling | 27 | save-draft.xpm stock_mail-handling |
| 28 | save.xpm ? | 28 | save.xpm combines stock_mail, io/stock_save and |
| 29 | stock_convert (from gnome-themes) | ||
| 29 | send.xpm stock_mail-send | 30 | send.xpm stock_mail-send |
| 30 | spam.xpm stock_spam | 31 | spam.xpm stock_spam |
| 31 | 32 | ||
| 33 | (preview and save were contributed by Adam Sjøgren <asjo@koldfront.dk>) | ||
| 32 | 34 | ||
| 33 | repack is a slightly modified version of package-x-generic. | 35 | repack is a slightly modified version of package-x-generic. |
| 34 | reply-from is a slightly modified version of reply. | 36 | reply-from is a slightly modified version of reply. |
diff --git a/nt/ChangeLog b/nt/ChangeLog index 448245fc51b..91696f44b0e 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2007-02-16 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * icons/gnu2a32.ico, icons/gnu2a32t.ico, icons/gnu2b48.ico: | ||
| 4 | * icons/gnu2b48t.ico, icons/gnu3b32.ico, icons/gnu3b32t.ico: | ||
| 5 | * icons/gnu4g48.ico, icons/gnu4g48t.ico, icons/gnu5w32.ico: | ||
| 6 | * icons/gnu5w32t.ico, icons/gnu6w48.ico, icons/gnu6w48t.ico: | ||
| 7 | * icons/gnu7.ico, icons/gnu8.ico, icons/gnu9.ico: Restore all but | ||
| 8 | two of icons deleted in previous change. | ||
| 9 | |||
| 1 | 2007-02-13 Chong Yidong <cyd@stupidchicken.com> | 10 | 2007-02-13 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 11 | ||
| 3 | * icons/README: New file. | 12 | * icons/README: New file. |
diff --git a/nt/icons/README b/nt/icons/README index b1592032d25..a11ffba6ed3 100644 --- a/nt/icons/README +++ b/nt/icons/README | |||
| @@ -5,6 +5,24 @@ Author: Andrew Zhilin | |||
| 5 | Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. | 5 | Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. |
| 6 | License: GNU General Public License version 2 or later (see COPYING) | 6 | License: GNU General Public License version 2 or later (see COPYING) |
| 7 | 7 | ||
| 8 | |||
| 9 | Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico | ||
| 10 | gnu3b32.ico gnu3b32t.ico gnu4g48.ico gnu4g48t.ico | ||
| 11 | gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico | ||
| 12 | gnu7.ico gnu8.ico gnu9.ico | ||
| 13 | Author: Rob Davenport <rgd at bigfoot.com> | ||
| 14 | Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 | ||
| 15 | Free Software Foundation, Inc. | ||
| 16 | License: GNU General Public License version 2 or later (see COPYING) | ||
| 17 | |||
| 18 | <http://users.adelphia.net/~rob.davenport/gnuicons.html> | ||
| 19 | "These are some images of a 3D stylized gnu head that I created back | ||
| 20 | in 1998. I started studying pictures of gnus and wildebeests and | ||
| 21 | worked with a 3D modeller, sPatch, until I came up with these. Then | ||
| 22 | I worked to make them into icons - cropping the horns off the sides | ||
| 23 | so the images were big enough to be recognizable (to me anyway)." | ||
| 24 | |||
| 25 | |||
| 8 | File: hand.cur | 26 | File: hand.cur |
| 9 | Converted from index.png in GTK+ 2.x by Jason Rumney. | 27 | Converted from index.png in GTK+ 2.x by Jason Rumney. |
| 10 | Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 | 28 | Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 |