Merge from emacs--rel--22

[gnu-emacs] / lisp / obsolete / hscroll.el

diff --git a/lisp/obsolete/hscroll.el b/lisp/obsolete/hscroll.el
index 0659c47c19962e32ee045f1a32a873ca9063f77c..970fca5f698a907692740da1be109ad91878a1ad 100644 (file)
--- a/lisp/obsolete/hscroll.el
+++ b/lisp/obsolete/hscroll.el
@@ -1,7 +1,7 @@
 ;;; hscroll.el --- automatically scroll truncated lines horizontally
 
-;; Copyright (C) 1992, 1993, 1995, 1996, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1995, 1996, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Wayne Mesard <wmesard@esd.sgi.com>
 ;; Keywords: display
@@ -10,7 +10,7 @@
 
 ;; 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,