diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /admin | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rw-r--r-- | admin/authors.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 8c0c9759e87..dc029a0be0c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2015-01-08 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * authors.el (authors-aliases): Add an entry to ignore. | ||
| 4 | |||
| 1 | 2015-01-04 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2015-01-04 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Less 'make' chatter for admin/grammars | 7 | Less 'make' chatter for admin/grammars |
diff --git a/admin/authors.el b/admin/authors.el index 1249806686a..afab6f0e1e8 100644 --- a/admin/authors.el +++ b/admin/authors.el | |||
| @@ -40,6 +40,7 @@ files.") | |||
| 40 | 40 | ||
| 41 | (defconst authors-aliases | 41 | (defconst authors-aliases |
| 42 | '( | 42 | '( |
| 43 | (nil "A\\. N\\. Other") ; unknown author 2014-12-03, later removed | ||
| 43 | ("Aaron S. Hawley" "Aaron Hawley") | 44 | ("Aaron S. Hawley" "Aaron Hawley") |
| 44 | ("Alexandru Harsanyi" "Alex Harsanyi") | 45 | ("Alexandru Harsanyi" "Alex Harsanyi") |
| 45 | ("Andrew Csillag" "Drew Csillag") | 46 | ("Andrew Csillag" "Drew Csillag") |