summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2008-01-26 21:49:41 +0000
committerMichael Olson <mwolson@gnu.org>2008-01-26 21:49:41 +0000
commit15db4a13e5ae62e10bda61ed78dd5024353e6499 (patch)
tree45f467556ec05af2042f55683061ddca960fc3ff /lisp/erc
parent0ea5797a183e5aaeb3be19ff8a95de0d28acd1c9 (diff)
downloademacs-15db4a13e5ae62e10bda61ed78dd5024353e6499.tar.gz
Sync ERC 5.3 release.
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog17
-rw-r--r--lisp/erc/erc.el2
2 files changed, 18 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3fb174c97d1..23057faa0b6 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,20 @@
+2008-01-26 Michael Olson <mwolson@gnu.org>
+
+ * erc.el (erc-version-string): Release ERC 5.3.
+
+ * Makefile (VERSION): Update.
+ (EXTRAS): Remove erc-list.el after all, because this is mainly for
+ users of the version that comes with Emacs, and they will have
+ erc-list.el by Emacs 23.
+ (MISC): Add ChangeLog.07.
+
+ * README.extras: Mention Emacs 23.
+
+ * erc.texi (Obtaining ERC): Update extras URLs for 5.3.
+ (Development): Write instructions for git, and remove those for
+ Arch.
+ (History): Mention the switch to git.
+
2008-01-25 Michael Olson <mwolson@gnu.org>
* NEWS: Update.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index aa03e67461f..e98c9d29baa 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -66,7 +66,7 @@
;;; Code:
-(defconst erc-version-string "Version 5.3 (RC 1)"
+(defconst erc-version-string "Version 5.3"
"ERC version. This is used by function `erc-version'.")
(eval-when-compile (require 'cl))