summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2005-09-12 06:49:54 +0000
committerKaroly Lorentey <lorentey@elte.hu>2005-09-12 06:49:54 +0000
commit262b162ac70eb07d3b9a591acc9d5a6c8ff90177 (patch)
tree2f596b520600ed0d426685a63517ad3a5f2ab814 /lisp/emacs-lisp
parent3fb8e5d73e6969a67b258a55f19cc4f4d89da639 (diff)
parentdf1b21421be7370610e8a56e665683619f9df87b (diff)
downloademacs-262b162ac70eb07d3b9a591acc9d5a6c8ff90177.tar.gz
emacs-262b162ac70eb07d3b9a591acc9d5a6c8ff90177.tar.bz2
emacs-262b162ac70eb07d3b9a591acc9d5a6c8ff90177.zip
Merged from miles@gnu.org--gnu-2005 (patch 115, 540-542)
Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-540 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-541 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-542 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-115 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-419
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/authors.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index ec5446eef38..437332baec9 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -78,6 +78,7 @@ files.")
("Jay K. Adams" "jka@ece.cmu.edu" "Jay Adams")
("J,Ai(Br,At(Bme Marant" "J,bi(Br,bt(Bme Marant" "Jerome Marant")
("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
+ ("Johan Bockg,Ae(Brd" "Johan Bockgard")
("John W. Eaton" "John Eaton")
("Jonathan I. Kamens" "Jonathan Kamens")
("Joseph Arceneaux" "Joe Arceneaux")
@@ -195,7 +196,7 @@ Changes to files in this list are not listed.")
("Michael K. Johnson" :changed "configure.in" "emacs.c" "intel386.h"
"mem-limits.h" "process.c" "template.h" "sysdep.c" "syssignal.h" "systty.h" "unexec.c"
"ymakefile" "linux.h")
- ("Kyle E. Jones" :wrote "mldrag.el")
+ ("Kyle Jones" :wrote "mldrag.el")
("Henry Kautz" :wrote "bib-mode.el")
("Joseph M. Kelsey" :changed "fileio.c" "vms-pwd.h" "vmsfns.c" "dir.h"
"uaf.h")