[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] [emacs] 02/02: Fix cherry-pick conflict.
|
From: |
Michael Albinus |
|
Subject: |
[Emacs-diffs] [emacs] 02/02: Fix cherry-pick conflict. |
|
Date: |
Sat, 15 Nov 2014 16:54:30 +0000 |
albinus pushed a commit to branch emacs-24
in repository emacs.
commit d4fceca9cd0d6f42bd45f4c6e572d1335c9d40dc
Author: Michael Albinus <address@hidden>
Date: Sat Nov 15 17:53:53 2014 +0100
Fix cherry-pick conflict.
---
lisp/ChangeLog | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9b3731..8f00403 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,8 @@
-2014-10-28 Peder O. Klingenberg <address@hidden> (tiny change)
-2014-11-13 Michael Albinus <address@hidden>
+2014-11-15 Michael Albinus <address@hidden>
* vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940)
-2014-11-10 Kenjiro NAKAYAMA <address@hidden>
+2014-10-28 Peder O. Klingenberg <address@hidden> (tiny change)
* mail/emacsbug.el (report-emacs-bug): Make a better guess at
envelope-from when reporting through sendmail (bug#19054).