diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-10-15 17:55:33 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-10-15 17:55:33 -0400 |
commit | 0c747cb143fa227e78f350ac353d703f489209df (patch) | |
tree | 5b434055c797bd75eaa1e3d9d0773e586d44daee /lisp/emacs-lisp/authors.el | |
parent | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (diff) | |
parent | aa095b2db98ae149737f8de00ee733b1d257ed33 (diff) | |
download | emacs-0c747cb143fa227e78f350ac353d703f489209df.tar.gz emacs-0c747cb143fa227e78f350ac353d703f489209df.tar.bz2 emacs-0c747cb143fa227e78f350ac353d703f489209df.zip |
Merge from trunk
Diffstat (limited to 'lisp/emacs-lisp/authors.el')
-rw-r--r-- | lisp/emacs-lisp/authors.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index 3bfa076d71c..248a2cf1312 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -507,6 +507,7 @@ Changes to files in this list are not listed.") "ymakefile" "permute-index" "index.perm" "ibmrs6000.inp" + "b2m.c" "emacs.ico" "emacs21.ico" "LPF" "LEDIT" "OTHER.EMACSES" @@ -1027,5 +1028,4 @@ the Emacs source tree, from which to build the file." (provide 'authors) -;; arch-tag: 659d5900-5ff2-43b0-954c-a315cc1e4dc1 ;;; authors.el ends here |