diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/s/gnu-linux.h | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 9c37b8eec03..a102f602bd7 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -1,7 +1,8 @@ | |||
| 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, 2011 Free Software Foundation, Inc. | 4 | 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 5 | Free Software Foundation, Inc. | ||
| 5 | 6 | ||
| 6 | This file was put together by Michael K. Johnson and Rik Faith. | 7 | This file was put together by Michael K. Johnson and Rik Faith. |
| 7 | 8 | ||
| @@ -160,5 +161,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 160 | #endif | 161 | #endif |
| 161 | #endif | 162 | #endif |
| 162 | 163 | ||
| 163 | /* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9 | ||
| 164 | (do not change this comment) */ | ||