diff options
| author | Michael Albinus | 2014-11-15 17:53:53 +0100 |
|---|---|---|
| committer | Michael Albinus | 2014-11-15 17:53:53 +0100 |
| commit | d4fceca9cd0d6f42bd45f4c6e572d1335c9d40dc (patch) | |
| tree | 7a239337197616e8a7ad9b13922680efee41cc27 | |
| parent | 260cedec96d52993c3798c4e6d844fbf30b82a8b (diff) | |
| download | emacs-d4fceca9cd0d6f42bd45f4c6e572d1335c9d40dc.tar.gz emacs-d4fceca9cd0d6f42bd45f4c6e572d1335c9d40dc.zip | |
Fix cherry-pick conflict.
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9b3731aae9..8f00403c39b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,9 +1,8 @@ | |||
| 1 | 2014-10-28 Peder O. Klingenberg <peder@klingenberg.no> (tiny change) | 1 | 2014-11-15 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 2014-11-13 Michael Albinus <michael.albinus@gmx.de> | ||
| 3 | 2 | ||
| 4 | * vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940) | 3 | * vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940) |
| 5 | 4 | ||
| 6 | 2014-11-10 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> | 5 | 2014-10-28 Peder O. Klingenberg <peder@klingenberg.no> (tiny change) |
| 7 | 6 | ||
| 8 | * mail/emacsbug.el (report-emacs-bug): Make a better guess at | 7 | * mail/emacsbug.el (report-emacs-bug): Make a better guess at |
| 9 | envelope-from when reporting through sendmail (bug#19054). | 8 | envelope-from when reporting through sendmail (bug#19054). |