Merge from trunk.

[gnu-emacs] / src / ChangeLog.1

diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index 9cb3e5ec18bf99cc0b93622986cad77ec8ea9651..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.