diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/erc/erc-dcc.el | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/erc/erc-dcc.el')
| -rw-r--r-- | lisp/erc/erc-dcc.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index e31416f0e1..dc67d3b01d 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -1,7 +1,7 @@ ;;; erc-dcc.el --- CTCP DCC module for ERC -;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2012 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2013 Free Software +;; Foundation, Inc. ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu> ;; Noah Friedman <friedman@prep.ai.mit.edu> |