Merge from emacs--devo--0

[gnu-emacs] / lisp / cvs-status.el

diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el
index 792dcb2ef262228a5352d15f59364adccadc6a14..82ac90453c87bd3a47574328a351e93aa96d1832 100644 (file)
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@@ -1,16 +1,16 @@
 ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
-;; Author: Stefan Monnier <monnier@cs.yale.edu>
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs cvs status tree tools
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -33,7 +33,6 @@
 
 (eval-when-compile (require 'cl))
 (require 'pcvs-util)
-(eval-when-compile (require 'pcvs))
 
 ;;;