Merge from emacs-23

[gnu-emacs] / etc / compilation.txt

diff --git a/etc/compilation.txt b/etc/compilation.txt
index 9ee2e16366b1400a091ff4bbc08809ed560c2347..9117b90b6b5d38ec28b035acf7bd6db7090c3d8d 100644 (file)
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -548,7 +548,7 @@ Compilation segmentation fault at Thu Jul 13 10:55:49
 Compilation finished at Thu Jul 21 15:02:15
 
 \f
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS: