Merge from cygw32 branch

[bpt/emacs.git] / src / ChangeLog.1

diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index 7fef45f..5265d6f 100644 (file)
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3521,7 +3521,7 @@
        * minibuf.c: Don't allow entry to minibuffer
        while minibuffer is selected.
 
-    Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
+    Copyright (C) 1985-1986, 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.