Merge from emacs-23

[gnu-emacs] / lisp / vc / compare-w.el

diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 6e2ab7327defeecc69caed633803cc5eed4a40b0..5b680ea4f1e7487a9e210a405ffd2765ade9a85c 100644 (file)
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -1,7 +1,7 @@
 ;;; compare-w.el --- compare text between windows for Emacs
 
 ;; Copyright (C) 1986, 1989, 1993, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience files vc