diff options
| author | Paul Eggert | 2015-03-03 14:52:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-03-03 14:52:04 -0800 |
| commit | 98284ef51c67fa69796946466337d426ab81f9ee (patch) | |
| tree | e43f8d3ab77f67a2fca1dd016037693674b91c26 /lisp/erc/ChangeLog | |
| parent | 518eab2f7db71929e4877daa5ebd06b1416e69e6 (diff) | |
| parent | c4ade119ccd1904795b2e8d76cd93aedc86d1b09 (diff) | |
| download | emacs-98284ef51c67fa69796946466337d426ab81f9ee.tar.gz emacs-98284ef51c67fa69796946466337d426ab81f9ee.zip | |
Merge from origin/emacs-24
c4ade11 textmodes/ispell.el: Look for aspell .dat files also under dict-dir
e28ec9a ispell.el: Extend to aspell current hunspell handling of aliases
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'lisp/erc/ChangeLog')
| -rw-r--r-- | lisp/erc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 22ebae4576c..4f5fced1bd5 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | package.el compatibility | 4 | package.el compatibility |
| 5 | 5 | ||
| 6 | 2015-03-03 Glenn Morris <rgm@gnu.org> | 6 | 2015-03-03 Glenn Morris <rgm@gnu.org> |
| 7 | 2015-03-03 Glenn Morris <rgm@gnu.org> | ||
| 8 | 7 | ||
| 9 | * erc.el (erc-rename-buffers): Doc fix. Add :version. | 8 | * erc.el (erc-rename-buffers): Doc fix. Add :version. |
| 10 | 9 | ||