Mercurial > emacs
diff src/s/gnu-linux.h @ 112228:417b1e4d63cd
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 12:18:41 -0500 |
| parents | a8b56c7dbb62 376148b31b5e |
| children | ef719132ddfa |
line wrap: on
line diff
--- a/src/s/gnu-linux.h Fri Jan 14 16:06:17 2011 +0100 +++ b/src/s/gnu-linux.h Fri Jan 14 12:18:41 2011 -0500 @@ -1,7 +1,7 @@ /* This file is the configuration file for Linux-based GNU systems Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file was put together by Michael K. Johnson and Rik Faith.
