diff options
| author | Alan Mackenzie | 2011-10-28 15:18:00 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2011-10-28 15:18:00 +0000 |
| commit | e376ea4f737a9230a9767a12bdcc530da4b4da87 (patch) | |
| tree | e74b45fc923a012322eb229ca403fcd07ec1f696 /lisp/ChangeLog | |
| parent | 1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab (diff) | |
| parent | d3d0842fe219892079cac179ab0843792f29cf1a (diff) | |
| download | emacs-e376ea4f737a9230a9767a12bdcc530da4b4da87.tar.gz emacs-e376ea4f737a9230a9767a12bdcc530da4b4da87.zip | |
Merge.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf4d87d3405..4ac4419b163 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-10-28 Deniz Dogan <deniz@dogan.se> | ||
| 2 | |||
| 3 | * net/rcirc.el (rcirc-mode): Use hard newlines. | ||
| 4 | |||
| 1 | 2011-10-28 Alan Mackenzie <acm@muc.de> | 5 | 2011-10-28 Alan Mackenzie <acm@muc.de> |
| 2 | 6 | ||
| 3 | Amend to indent and fontify macros "which include their own semicolon" | 7 | Amend to indent and fontify macros "which include their own semicolon" |