diff options
| author | Stefan Monnier | 2014-10-20 21:17:06 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-10-20 21:17:06 -0400 |
| commit | eed18bf1fd1162872e196091ab795a773f277e8e (patch) | |
| tree | f3fee81f1e7fdf23b57138740437e07ce244ede8 /admin/ChangeLog | |
| parent | 8a85c254de2528be0f3ff154fa24df65e6557c1a (diff) | |
| parent | 1fc82d89a8a603754d17a35be1ce78e66d0b6fd6 (diff) | |
| download | emacs-eed18bf1fd1162872e196091ab795a773f277e8e.tar.gz emacs-eed18bf1fd1162872e196091ab795a773f277e8e.zip | |
Merge from emacs-24
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 8870f7cf4a2..6cac023cbb3 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -89,7 +89,7 @@ | |||
| 89 | 89 | ||
| 90 | * notes/copyright: Remove mention of msdos/is_exec.c and | 90 | * notes/copyright: Remove mention of msdos/is_exec.c and |
| 91 | sigaction.c. | 91 | sigaction.c. |
| 92 | * authors.el (authors-renamed-files-alist): Removed is_exec.c. | 92 | * authors.el (authors-renamed-files-alist): Remove is_exec.c. |
| 93 | 93 | ||
| 94 | 2014-08-07 Reuben Thomas <rrt@sc3d.org> | 94 | 2014-08-07 Reuben Thomas <rrt@sc3d.org> |
| 95 | 95 | ||
| @@ -2039,7 +2039,7 @@ | |||
| 2039 | 2039 | ||
| 2040 | 2006-04-17 Ramprasad B <ramprasad_i82@yahoo.com> | 2040 | 2006-04-17 Ramprasad B <ramprasad_i82@yahoo.com> |
| 2041 | 2041 | ||
| 2042 | * ./* (Copyright): Updated Copyright year(s). | 2042 | * ./* (Copyright): Update Copyright year(s). |
| 2043 | 2043 | ||
| 2044 | 2006-02-24 Reiner Steib <Reiner.Steib@gmx.de> | 2044 | 2006-02-24 Reiner Steib <Reiner.Steib@gmx.de> |
| 2045 | 2045 | ||