aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2013-01-05 00:04:41 +0100
committerJoakim Verona2013-01-05 00:04:41 +0100
commitb18e01b65e651d3b626b4edcaaa2aa636fe25b69 (patch)
tree2832e227a4c45d3a4d423f972df29fb7f8616b14 /lisp/erc/ChangeLog
parent55b74b54b179f340bdb311070273f26da3fbd0c9 (diff)
parent1bd71e9fe16541bc48868a00ff372018961380b0 (diff)
downloademacs-b18e01b65e651d3b626b4edcaaa2aa636fe25b69.tar.gz
emacs-b18e01b65e651d3b626b4edcaaa2aa636fe25b69.zip
auto upstream
Diffstat (limited to 'lisp/erc/ChangeLog')
-rw-r--r--lisp/erc/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 0366addacfc..3a625eb215e 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
12013-01-04 Glenn Morris <rgm@gnu.org>
2
3 * erc-backend.el (312): Fix typo. (Bug#13235)
4
12012-11-30 Glenn Morris <rgm@gnu.org> 52012-11-30 Glenn Morris <rgm@gnu.org>
2 6
3 * erc.el (erc-accidental-paste-threshold-seconds): Add :version. 7 * erc.el (erc-accidental-paste-threshold-seconds): Add :version.