diff options
| author | Stefan Monnier | 2014-06-26 09:40:49 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-06-26 09:40:49 -0400 |
| commit | 7d1fd42bd6480aa9ea1286dba3c730c2391fcc2b (patch) | |
| tree | 572f89beaf718edbda1dc2ce70d1582e7176d85b /lisp/ChangeLog | |
| parent | 436550da1bf8d2cdd92a60f6ce84f131a8045062 (diff) | |
| download | emacs-7d1fd42bd6480aa9ea1286dba3c730c2391fcc2b.tar.gz emacs-7d1fd42bd6480aa9ea1286dba3c730c2391fcc2b.zip | |
* lisp/progmodes/hideif.el: Undo last change which should only go to trunk
(do not merge).
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): |