aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-02-20 12:23:47 -0800
committerGlenn Morris2012-02-20 12:23:47 -0800
commitc60293480dbfe1c27849b84dda435b660f922131 (patch)
tree54d51eaabee310aa2039029320d5eeb9f776111b
parent048df7b38a239b653d1635ac95ba080a66282e8b (diff)
downloademacs-c60293480dbfe1c27849b84dda435b660f922131.tar.gz
emacs-c60293480dbfe1c27849b84dda435b660f922131.zip
* lisp/emacs-lisp/authors.el (authors-aliases): Add another entry.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/authors.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 629b5b19d93..1512024695c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-02-20 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/authors.el (authors-aliases): Add another entry.
4
12012-02-20 Leo Liu <sdl.web@gmail.com> 52012-02-20 Leo Liu <sdl.web@gmail.com>
2 6
3 * icomplete.el (icomplete-completions): Check FROM arg before 7 * icomplete.el (icomplete-completions): Check FROM arg before
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index bf9f500b542..495144f7252 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -1,6 +1,6 @@
1;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: utf-8;-*- 1;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: utf-8;-*-
2 2
3;; Copyright (C) 2000-2012 Free Software Foundation, Inc. 3;; Copyright (C) 2000-2012 Free Software Foundation, Inc.
4 4
5;; Author: Gerd Moellmann <gerd@gnu.org> 5;; Author: Gerd Moellmann <gerd@gnu.org>
6;; Maintainer: Kim F. Storm <storm@cua.dk> 6;; Maintainer: Kim F. Storm <storm@cua.dk>
@@ -58,6 +58,7 @@ files.")
58 ("David M. Koppelman" "David M. Koppelman, Koppel@Ec?e.Lsu.Edu" 58 ("David M. Koppelman" "David M. Koppelman, Koppel@Ec?e.Lsu.Edu"
59 "David Koppelman") 59 "David Koppelman")
60 ("David M. Smith" "David Smith" "David M Smith") 60 ("David M. Smith" "David Smith" "David M Smith")
61 ("David O'Toole" "David T. O'Toole")
61 ("Deepak Goel" "D. Goel") 62 ("Deepak Goel" "D. Goel")
62 ("Ed L. Cashin" "Ed L Cashin") 63 ("Ed L. Cashin" "Ed L Cashin")
63 ("Edward M. Reingold" "Ed Reingold" "Edward M Reingold" 64 ("Edward M. Reingold" "Ed Reingold" "Edward M Reingold"