aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc/ChangeLog')
-rw-r--r--lisp/erc/ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 6591db6cd9..90b3131ebd 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-14 Vivek Dasmohapatra <[email protected]>
+
+ * erc-join.el (erc-autojoin-timing, erc-autojoin-delay): New vars.
+ (erc-autojoin-channels-delayed, erc-autojoin-after-ident): New
+ functions.
+ (erc-autojoin-channels): Allow autojoining after ident (Bug#5521).
+
2010-08-08 Fran Litterio <[email protected]>
* erc-backend.el (erc-server-filter-function): Call