diff options
| author | Paul Eggert | 2011-10-22 23:38:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-22 23:38:24 -0700 |
| commit | cfc09582247ffef6a46b6249e2fba9136a62d21e (patch) | |
| tree | 50e102f64a2b88c692d9110990abd416c78c32f0 /lisp/erc/ChangeLog | |
| parent | 92c938895c639463681ae1c58a944cae62b70b87 (diff) | |
| parent | 86c606818495d9411fd5d6b1477f9a097eb18020 (diff) | |
| download | emacs-cfc09582247ffef6a46b6249e2fba9136a62d21e.tar.gz emacs-cfc09582247ffef6a46b6249e2fba9136a62d21e.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/erc/ChangeLog')
| -rw-r--r-- | lisp/erc/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 7c7f10de2c8..d72d3f51bb1 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2011-10-20 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * erc.el (define-erc-module): Fix autogenerated docstring to | ||
| 4 | reflect Emacs 24 minor mode changes. | ||
| 5 | |||
| 6 | * erc-fill.el (erc-fill-mode): | ||
| 7 | * erc-track.el (erc-track-minor-mode): Doc fix. | ||
| 8 | |||
| 1 | 2011-09-23 Antoine Levitt <antoine.levitt@gmail.com> | 9 | 2011-09-23 Antoine Levitt <antoine.levitt@gmail.com> |
| 2 | 10 | ||
| 3 | * erc-button.el (erc-button-next-function): Scoping fix | 11 | * erc-button.el (erc-button-next-function): Scoping fix |