Merge from emacs-23; up to 2010-06-12T11:17:12Z!eliz@gnu.org.

[gnu-emacs] / src / ChangeLog.1

diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index b1dca3c0ca1dad98bbe8a377538b6dfe88eda18c..e32db190cd0d404aa6a813ca59e9a8d9d465d893 100644 (file)
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3521,8 +3521,7 @@
        * minibuf.c: Don't allow entry to minibuffer
        while minibuffer is selected.
 
-    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-       2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+    Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -3539,4 +3538,3 @@
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: 2d2c1086-b0a5-437c-bc58-fb38ce2e0f9b