summaryrefslogtreecommitdiff
path: root/lisp/erc/ChangeLog.1
diff options
context:
space:
mode:
authorJoakim Verona <joakim@verona.se>2016-01-15 20:06:45 +0100
committerJoakim Verona <joakim@verona.se>2016-01-15 20:06:45 +0100
commit4b73dac2885aa7eb23b66c299065e19bd118a4fb (patch)
tree18452b36b890faf52d40f555ebe4dc3c6e020bc6 /lisp/erc/ChangeLog.1
parent0d824cc5e79e7d29a01929a51dfd673a117c77e8 (diff)
parent984a14904658da42ca9dea50a811a901ddc56e60 (diff)
downloademacs-xwidget_mvp.tar.gz
merge masterxwidget_mvp
Diffstat (limited to 'lisp/erc/ChangeLog.1')
-rw-r--r--lisp/erc/ChangeLog.12
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1
index 790d049f422..407beb47d79 100644
--- a/lisp/erc/ChangeLog.1
+++ b/lisp/erc/ChangeLog.1
@@ -11706,7 +11706,7 @@
* erc-speak.el, erc.el: New file.
- Copyright (C) 2001-2015 Free Software Foundation, Inc.
+ Copyright (C) 2001-2016 Free Software Foundation, Inc.
This file is part of GNU Emacs.