aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2014-06-26 20:34:42 -0400
committerGlenn Morris <[email protected]>2014-06-26 20:34:42 -0400
commitb63a16ef8aef859562bf5de722eb9f64101d154e (patch)
tree45cef45a7f363c668936816cdd8620237302d8c2 /lisp
parent50ccef4f27a9749ec07fe137ded8ec68bba6ca4e (diff)
ChangeLog fix (no need to merge to trunk)
Since the change was just quickly reverting a change that does not have a ChangeLog entry of its own, it's confusing and unnecessary for the reversion to have a ChangeLog entry.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
1 files changed, 0 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21cc087aca..cb9953b069 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,11 +15,6 @@
we can't verify signature because of missing public key
(backport for bug#17625).
-2014-06-26 Stefan Monnier <[email protected]>
-
- * progmodes/hideif.el: Undo last change which should only go to trunk
- (do not merge).
-
2014-06-26 Glenn Morris <[email protected]>
* emacs-lisp/cl-macs.el (help-add-fundoc-usage):