diff options
| author | Joakim Verona | 2011-02-05 11:23:09 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-02-05 11:23:09 +0100 |
| commit | 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (patch) | |
| tree | 894801e7308ce4ecc34933f959e28f4b9cff9533 /src/s/gnu-linux.h | |
| parent | 13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (diff) | |
| parent | 9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff) | |
| download | emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.tar.gz emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.zip | |
merge from upstream. currently seems to have bitroted and i get segfaults
Diffstat (limited to 'src/s/gnu-linux.h')
| -rw-r--r-- | src/s/gnu-linux.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 9327423b42f..84fe5b92da9 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -1,7 +1,7 @@ | |||
| 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-2011 |
| 4 | 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | 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 | ||
| @@ -159,6 +159,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 159 | } while (0) | 159 | } while (0) |
| 160 | #endif | 160 | #endif |
| 161 | #endif | 161 | #endif |
| 162 | |||
| 163 | /* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9 | ||
| 164 | (do not change this comment) */ | ||