Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 112227:07e52ed69b5d | 112228:417b1e4d63cd |
|---|---|
| 1 /* This file is the configuration file for Linux-based GNU systems | 1 /* This file is the configuration file for Linux-based GNU systems |
| 2 | 2 |
| 3 Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, | 3 Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004, |
| 4 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 5 | 5 |
| 6 This file was put together by Michael K. Johnson and Rik Faith. | 6 This file was put together by Michael K. Johnson and Rik Faith. |
| 7 | 7 |
| 8 This file is part of GNU Emacs. | 8 This file is part of GNU Emacs. |
| 9 | 9 |
