diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 34d057c10f1..8cc59d88615 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-06-26 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * progmodes/hideif.el: Undo last change which should only go to trunk | ||
| 4 | (do not merge). | ||
| 5 | |||
| 1 | 2014-06-26 Glenn Morris <rgm@gnu.org> | 6 | 2014-06-26 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * emacs-lisp/cl-macs.el (help-add-fundoc-usage): | 8 | * emacs-lisp/cl-macs.el (help-add-fundoc-usage): |