diff options
| author | Stefan Monnier | 2010-06-09 21:10:04 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-06-09 21:10:04 -0400 |
| commit | a71832f78d2fa8128a03aeb551a1ec0895b49f67 (patch) | |
| tree | cfc3957c629d290b3af9e4f71a6b8e89d8bf4c10 /lisp/ChangeLog | |
| parent | fff84c22e7e57d7364c2298aebf1b35796fc852b (diff) | |
| download | emacs-a71832f78d2fa8128a03aeb551a1ec0895b49f67.tar.gz emacs-a71832f78d2fa8128a03aeb551a1ec0895b49f67.zip | |
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve
merge conflict, giving preference to the emacs-23 version of the code.
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 aa2fed11ea2..d5e0b5ac4f4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-06-10 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve | ||
| 4 | merge conflict, giving preference to the emacs-23 version of the code. | ||
| 5 | |||
| 1 | 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emacs-lisp/advice.el (ad-compile-function): | 8 | * emacs-lisp/advice.el (ad-compile-function): |