diff options
| author | Stefan Monnier | 2010-05-08 14:47:07 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-05-08 14:47:07 -0400 |
| commit | 0235128c15aabd21b37e7a359b4932709471f156 (patch) | |
| tree | 4f32e3a638c4e3d6e7d9c232b3e0b4b939368f54 /lisp/erc | |
| parent | ca63fca5b669d42d8c131a1f33446d9a9d7795f6 (diff) | |
| parent | 19ae0deb1c8c9475eb81daf7876cec5a44b5d5e0 (diff) | |
| download | emacs-0235128c15aabd21b37e7a359b4932709471f156.tar.gz emacs-0235128c15aabd21b37e7a359b4932709471f156.zip | |
Merge from emacs-23
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 18fc5f188a9..7a29e3d0776 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-05-07 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * Version 23.2 released. | ||
| 4 | |||
| 1 | 2010-03-10 Chong Yidong <cyd@stupidchicken.com> | 5 | 2010-03-10 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * Branch for 23.2. | 7 | * Branch for 23.2. |
| @@ -12,8 +16,8 @@ | |||
| 12 | (erc-server-reconnect): Use it to reconnect via old | 16 | (erc-server-reconnect): Use it to reconnect via old |
| 13 | connector (Bug#4958). | 17 | connector (Bug#4958). |
| 14 | 18 | ||
| 15 | * erc.el (erc-determine-parameters): Save | 19 | * erc.el (erc-determine-parameters): |
| 16 | erc-server-connect-function to erc-session-connector. | 20 | Save erc-server-connect-function to erc-session-connector. |
| 17 | 21 | ||
| 18 | 2009-11-03 Stefan Monnier <monnier@iro.umontreal.ca> | 22 | 2009-11-03 Stefan Monnier <monnier@iro.umontreal.ca> |
| 19 | 23 | ||