summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-01-02 15:50:46 -0800
committerGlenn Morris <rgm@gnu.org>2011-01-02 15:50:46 -0800
commit5df4f04cd32af723742c81095b38ae83b3c2b462 (patch)
treec340e724a44fb95d954387f97b65f64953d2779b /lisp/ediff.el
parentd12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f (diff)
downloademacs-5df4f04cd32af723742c81095b38ae83b3c2b462.tar.gz
Add 2011 to FSF/AIST copyright years.
Diffstat (limited to 'lisp/ediff.el')
-rw-r--r--lisp/ediff.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 97dc537cd7e..bdd8b88e094 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1,7 +1,7 @@
;;; ediff.el --- a comprehensive visual interface to diff & patch
;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Created: February 2, 1994