Mercurial > emacs
diff src/s/gnu-linux.h @ 112330:56d3e9c28eb0
Merge from mainline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 17 Jan 2011 11:01:01 -0800 |
parents | 61f7601898b1 |
children |
line wrap: on
line diff
--- a/src/s/gnu-linux.h Sun Jan 16 18:35:15 2011 -0800 +++ b/src/s/gnu-linux.h Mon Jan 17 11:01:01 2011 -0800 @@ -1,7 +1,8 @@ /* 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, 2011 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. @@ -160,5 +161,3 @@ #endif #endif -/* arch-tag: 6244ea2a-abd0-44ec-abec-ff3dcc9afea9 - (do not change this comment) */