projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9927582 e12d1fb)
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Mon, 3 Aug 2020 15:31:15 +0000 (08:31 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 3 Aug 2020 15:31:15 +0000 (08:31 -0700)
e12d1fbc15 ; ChangeLog.3 and etc/AUTHORS fixes
748f0d4bc6 * admin/authors.el (authors-aliases): Remove a faulty regexp.

# Conflicts:
# etc/AUTHORS

1  2 
admin/authors.el patch | diff1 | diff2 | blob | history

diff --cc admin/authors.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.