aboutsummaryrefslogtreecommitdiffstats
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorMiles Bader2007-01-17 18:17:25 +0000
committerMiles Bader2007-01-17 18:17:25 +0000
commit6904f7fe8ed11bf4c94c009b4ef300f4ccdfa2e6 (patch)
tree5d3f9cf0ca50143225d6e0622620942f90d90d78 /etc/ChangeLog
parentc5f847b6b3c1733731e079c3adaca0c30ed69522 (diff)
downloademacs-6904f7fe8ed11bf4c94c009b4ef300f4ccdfa2e6.tar.gz
emacs-6904f7fe8ed11bf4c94c009b4ef300f4ccdfa2e6.zip
Merge from erc--main--0
Highlights: - Display messages starting with "/" but are not commands correctly. - Add erc-capab.el file, with capab-identify module. - Fix various ERC menu bugs and add "Current channel" submenu. - Make header-line display look nicer. - Fix warning when auto-authenticating to bitlbee. - New option erc-system-name allows the hostname next to your nick to be customized. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-599 Creator: Michael Olson <mwolson@gnu.org>
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 50a18ac4187..a01984d0bac 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12007-01-13 Michael Olson <mwolson@gnu.org>
2
3 * ERC-NEWS: Mention new erc-capab.el file.
4
12007-01-13 Glenn Morris <rgm@gnu.org> 52007-01-13 Glenn Morris <rgm@gnu.org>
2 6
3 * MACHINES: Add information on compiling 32-bit Emacs on 64-bit 7 * MACHINES: Add information on compiling 32-bit Emacs on 64-bit