summaryrefslogtreecommitdiff
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2006-11-20 06:50:29 +0000
committerMiles Bader <miles@gnu.org>2006-11-20 06:50:29 +0000
commit83dc6995148085966eddca749228a6338b7e6b0e (patch)
tree0fbf7066385873a51749737e5ac0d9c57b8a3d28 /etc/ChangeLog
parente15a04955b0c59069aa870d7d5040bc2e795b2eb (diff)
downloademacs-83dc6995148085966eddca749228a6338b7e6b0e.tar.gz
Merge from erc--emacs--22
Merge from my ERC Emacs 22 integration branch. The version is now "5.2 stable pre-release". This will probably be the last change to the version of ERC in Emacs 22 before the release, pending any bugfixes. For details on the changes, see the lisp/erc/ChangeLog file. Note that ERC is now invoked with M-x erc, not M-x erc-select. If you were using the old `erc' function programmatically, use `erc-open' instead. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-520 Creator: Michael Olson <mwolson@gnu.org>
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 003b625c3f3..5d43d90da42 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-20 Michael Olson <mwolson@gnu.org>
+
+ * NEWS: Change M-x erc-select to M-x erc.
+
2006-11-20 Sun Yijiang <sunyijiang@gmail.com>
* TUTORIAL.cn: Updated.
@@ -92,6 +96,11 @@
* PROBLEMS (are): Emacs compiled with Gtk+ crashes when closing a
display (x-close-connection).
+2006-09-03 Diane Murray <disumu@x3y2z1.net>
+
+ * erc.texi (Getting Started, Connecting): Changed erc-select to
+ erc.
+
2006-09-02 Juri Linkov <juri@jurta.org>
* HELLO: Regroup Europe Non-ASCII examples by similar scripts.