From: Glenn Morris Date: Fri, 16 Feb 2007 01:20:46 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: emacs-pretest-22.0.94~151 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c14693e3c3a019e66983f5a6ff2b08a56dfa5155;p=emacs.git *** empty log message *** --- 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 etc/MAILINGLISTS rms: simple license is fine for this file +etc/images/icons/* +nt/icons/emacs21.ico +src/gnu.h + Note that Andrew Zhilin has a copyright assignment on file (confirmed + by fsf-records), even though it doesn't seem to show up in + copyright.list for some reason (at time of writing, 2007/02). + http://lists.gnu.org/archive/html/emacs-devel/2005-11/msg00349.html + leim/CXTERM-DIC/4Corner.tit, ARRAY30.tit, CCDOSPY.tit, ECDICT.tit, ETZY.tit, PY-b5.tit, Punct-b5.tit, Punct.tit, QJ-b5.tit, QJ.tit, SW.tit, TONEPY.tit, ZOZY.tit @@ -235,14 +243,6 @@ etc/BABYL assignment. RMS: "The lawyer said we can keep BABYL." -etc/images/icons/* -nt/icons/emacs21.ico -src/gnu.h - Has Andrew Zhilin's 2005-11 assignment been correctly noted in - copyright.list? Mail sent to fsf-records. - http://lists.gnu.org/archive/html/emacs-devel/2005-11/msg00349.html - - REMOVED etc/orgcard.tex, orgcard.ps Re-add these files if an assignment is received from Rooke. @@ -310,9 +310,10 @@ etc/e/eterm-color.ti - no copyright US; I am not sure whether we can rely on that in general." -etc/TUTORIAL* - switch to GPL. Depending on how rms wants this done, this may - require the translators. +etc/TUTORIAL* (translations) + switch to GPL (see english TUTORIAL) + rms: "We can leave the TUTORIAL translations alone until their + maintainers update them." 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 move.xpm stock_mail-move not-spam.xpm stock_not-spam outbox.xpm stock_outbox -preview.xpm ? +preview.xpm combines stock_mail and navigation/stock_zoom reply-all.xpm stock_mail-reply-to-all reply.xpm stock_mail-reply save-draft.xpm stock_mail-handling -save.xpm ? +save.xpm combines stock_mail, io/stock_save and + stock_convert (from gnome-themes) send.xpm stock_mail-send spam.xpm stock_spam +(preview and save were contributed by Adam Sjøgren ) repack is a slightly modified version of package-x-generic. 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 @@ +2007-02-16 Glenn Morris + + * icons/gnu2a32.ico, icons/gnu2a32t.ico, icons/gnu2b48.ico: + * icons/gnu2b48t.ico, icons/gnu3b32.ico, icons/gnu3b32t.ico: + * icons/gnu4g48.ico, icons/gnu4g48t.ico, icons/gnu5w32.ico: + * icons/gnu5w32t.ico, icons/gnu6w48.ico, icons/gnu6w48t.ico: + * icons/gnu7.ico, icons/gnu8.ico, icons/gnu9.ico: Restore all but + two of icons deleted in previous change. + 2007-02-13 Chong Yidong * 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 Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. License: GNU General Public License version 2 or later (see COPYING) + +Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico + gnu3b32.ico gnu3b32t.ico gnu4g48.ico gnu4g48t.ico + gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico + gnu7.ico gnu8.ico gnu9.ico +Author: Rob Davenport +Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 + Free Software Foundation, Inc. +License: GNU General Public License version 2 or later (see COPYING) + + + "These are some images of a 3D stylized gnu head that I created back + in 1998. I started studying pictures of gnus and wildebeests and + worked with a 3D modeller, sPatch, until I came up with these. Then + I worked to make them into icons - cropping the horns off the sides + so the images were big enough to be recognizable (to me anyway)." + + File: hand.cur Converted from index.png in GTK+ 2.x by Jason Rumney. Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007