summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2006-12-08 07:13:33 +0000
committerMiles Bader <miles@gnu.org>2006-12-08 07:13:33 +0000
commitcb0a26d3c3db1b816b57219e4830d5c2bc479bbf (patch)
tree01bdc7b19dba01290ea49f499f04024d714cf80d /etc
parentaddc252e942e740e4d7603949c7f5594f4d07e47 (diff)
downloademacs-cb0a26d3c3db1b816b57219e4830d5c2bc479bbf.tar.gz
Update from erc--emacs--22
Highlights: - Remove contributions from someone who has not assigned changes yet. - Merge in a couple of bug-fixes from the main branch. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-546 Creator: Michael Olson <mwolson@gnu.org>
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/ERC-NEWS5
2 files changed, 9 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 12ab19fa7b1..13aa4c593c6 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-08 Michael Olson <mwolson@gnu.org>
+
+ * ERC-NEWS: Note that the list module has been removed.
+
2006-12-05 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org>
* NEWS (Changes to cmuscheme): Mention the alternative for
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index cce444749c4..5b0cd6f260f 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -10,6 +10,11 @@ known as `erc' is now `erc-open'.
** Changes and additions to modules
+*** Channel lists (erc-list.el)
+
+**** This has been removed from Emacs 22, since a major contributor
+to it has not yet assigned changes.
+
*** Channel tracking (erc-track.el)
**** Use mouse-face and help-echo for channel names in the mode-line.