Rudimentary support for vc-pull and vc-merge in Git and Mercurial.

[bpt/emacs.git] / lisp / image-file.el

diff --git a/lisp/image-file.el b/lisp/image-file.el
index 04420eb..bd1c101 100644 (file)
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -1,7 +1,6 @@
 ;;; image-file.el --- support for visiting image files
 ;;
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: multimedia
@@ -202,5 +201,4 @@ Image files are those whose name has an extension in
 
 (provide 'image-file)
 
-;; arch-tag: 04cafe36-f7ba-4c80-9f47-4cb656520ce1
 ;;; image-file.el ends here