diff options
author | Miles Bader <miles@gnu.org> | 2006-02-08 04:26:44 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2006-02-08 04:26:44 +0000 |
commit | 380874900ca183ec2fdce91949d841328852d7a8 (patch) | |
tree | 6918a4182f8657251e83223511aa7827fb8820ed /mac/inc/sys | |
parent | 72b464afc12a7532fc8555352db04c65647c15ae (diff) | |
parent | c96ec15a58817ac97db5348187e2d8695f609cb5 (diff) | |
download | emacs-380874900ca183ec2fdce91949d841328852d7a8.tar.gz |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 43-57)
- Update from CVS
- Merge from erc--emacs--0
- Make constrain-to-field notice overlays
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 18-21)
- Update from CVS
- Merge from emacs--devo--0
Diffstat (limited to 'mac/inc/sys')
-rw-r--r-- | mac/inc/sys/file.h | 2 | ||||
-rw-r--r-- | mac/inc/sys/ioctl.h | 2 | ||||
-rw-r--r-- | mac/inc/sys/param.h | 2 | ||||
-rw-r--r-- | mac/inc/sys/stat.h | 2 | ||||
-rw-r--r-- | mac/inc/sys/time.h | 3 | ||||
-rw-r--r-- | mac/inc/sys/types.h | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/mac/inc/sys/file.h b/mac/inc/sys/file.h index f2686a5cc13..508a89869a6 100644 --- a/mac/inc/sys/file.h +++ b/mac/inc/sys/file.h @@ -1,6 +1,6 @@ /* Replacement sys/file.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h index bdf68b97357..22335db7c38 100644 --- a/mac/inc/sys/ioctl.h +++ b/mac/inc/sys/ioctl.h @@ -1,6 +1,6 @@ /* Replacement sys/ioctl.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/param.h b/mac/inc/sys/param.h index 8849489f7c6..28f8f1e9d2c 100644 --- a/mac/inc/sys/param.h +++ b/mac/inc/sys/param.h @@ -1,6 +1,6 @@ /* Replacement sys/param.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/stat.h b/mac/inc/sys/stat.h index 2b8f9bfce79..dd99df5fda2 100644 --- a/mac/inc/sys/stat.h +++ b/mac/inc/sys/stat.h @@ -1,6 +1,6 @@ /* Replacement sys/stat.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/time.h b/mac/inc/sys/time.h index b28a87e7d32..e584cb89ff7 100644 --- a/mac/inc/sys/time.h +++ b/mac/inc/sys/time.h @@ -1,5 +1,6 @@ /* Replacement sys/time.h file for building GNU Emacs on the Macintosh. - Copyright (C) 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/mac/inc/sys/types.h b/mac/inc/sys/types.h index bdc4f6c5be2..34f3cbca87f 100644 --- a/mac/inc/sys/types.h +++ b/mac/inc/sys/types.h @@ -1,6 +1,6 @@ /* Replacement sys/types.h file for building GNU Emacs on the Macintosh. Copyright (C) 1999, 2000, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. |