diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /msdos | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 2 | ||||
| -rw-r--r-- | msdos/README | 2 | ||||
| -rw-r--r-- | msdos/mainmake | 2 | ||||
| -rw-r--r-- | msdos/mainmake.v2 | 2 | ||||
| -rw-r--r-- | msdos/sed1.inp | 4 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 4 | ||||
| -rw-r--r-- | msdos/sed2.inp | 4 | ||||
| -rw-r--r-- | msdos/sed2v2.inp | 2 | ||||
| -rw-r--r-- | msdos/sed2x.inp | 4 | ||||
| -rw-r--r-- | msdos/sed3.inp | 4 | ||||
| -rw-r--r-- | msdos/sed3v2.inp | 4 | ||||
| -rw-r--r-- | msdos/sed4.inp | 4 | ||||
| -rw-r--r-- | msdos/sed5x.inp | 4 | ||||
| -rw-r--r-- | msdos/sed6.inp | 2 | ||||
| -rw-r--r-- | msdos/sedleim.inp | 4 | ||||
| -rw-r--r-- | msdos/sedlisp.inp | 4 |
16 files changed, 26 insertions, 26 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index ef25dc257f0..52fc89f1557 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -629,7 +629,7 @@ ;; End: Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, - 2004, 2005, 2006 Free Software Foundation, Inc. + 2004, 2005, 2006, 2007 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff --git a/msdos/README b/msdos/README index 40f579cf49f..890168bfac4 100644 --- a/msdos/README +++ b/msdos/README @@ -7,7 +7,7 @@ Windows 3.X. Since these are binary files, their copyright notice is reproduced here: # Copyright (C) 1993, 2002, 2003, 2004, 2005, -# 2006 Free Software Foundation, Inc. +# 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/mainmake b/msdos/mainmake index 1b69bfd24e6..569387f65d2 100644 --- a/msdos/mainmake +++ b/msdos/mainmake @@ -1,5 +1,5 @@ # Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index d46651e3253..14610ba79bb 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 @@ -1,7 +1,7 @@ # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/msdos/sed1.inp b/msdos/sed1.inp index b13a7ae08ac..5fef6695f0e 100644 --- a/msdos/sed1.inp +++ b/msdos/sed1.inp @@ -2,8 +2,8 @@ # Configuration script for src/makefile # ---------------------------------------------------------------------- # -# Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, +# 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index be672842410..688a946b5d5 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -2,8 +2,8 @@ # Configuration script for src/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2.inp b/msdos/sed2.inp index 3f5852e6c59..13b7169b302 100644 --- a/msdos/sed2.inp +++ b/msdos/sed2.inp @@ -2,8 +2,8 @@ # Configuration script for src/config.h # ---------------------------------------------------------------------- # -# Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003, -# 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 20e478522a7..786374bfb46 100644 --- a/msdos/sed2v2.inp +++ b/msdos/sed2v2.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003, -# 2004, 2005, 2006 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp index b31d1361ace..f7ddf2c193a 100644 --- a/msdos/sed2x.inp +++ b/msdos/sed2x.inp @@ -2,8 +2,8 @@ # Extra configuration script for src/config.h for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2002, 2003, 2004, 2005, -# 2006 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, +# 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed3.inp b/msdos/sed3.inp index 299e44fe6df..69c27620443 100644 --- a/msdos/sed3.inp +++ b/msdos/sed3.inp @@ -2,8 +2,8 @@ # Configuration script for lib-src/makefile # ---------------------------------------------------------------------- # -# Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 39d644999fa..bd4521e107b 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -2,8 +2,8 @@ # Configuration script for lib-src/makefile under DJGPP v2 # ---------------------------------------------------------------------- # -# Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed4.inp b/msdos/sed4.inp index fcdf6cef47d..0c141b53e66 100644 --- a/msdos/sed4.inp +++ b/msdos/sed4.inp @@ -2,8 +2,8 @@ # Configuration script for src/paths.h # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2002, 2003, 2004, 2005, -# 2006 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, +# 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp index 54d56825bef..4bb860e415a 100644 --- a/msdos/sed5x.inp +++ b/msdos/sed5x.inp @@ -2,8 +2,8 @@ # Configuration script for oldxmenu/makefile for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2002, 2003, 2004, 2005, -# 2006 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, +# 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed6.inp b/msdos/sed6.inp index b74d2aa3a54..fe377878b5d 100644 --- a/msdos/sed6.inp +++ b/msdos/sed6.inp @@ -4,7 +4,7 @@ # --------------------------------------------------------------------------- # # Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp index c5d2e1daded..5b10be9d65d 100644 --- a/msdos/sedleim.inp +++ b/msdos/sedleim.inp @@ -2,8 +2,8 @@ # Configuration script for leim/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 1999, 2000, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp index 49dcabc588a..1372dbd9b67 100644 --- a/msdos/sedlisp.inp +++ b/msdos/sedlisp.inp @@ -2,8 +2,8 @@ # Configuration script for lisp/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2000, 2002, 2003, 2004, 2005, -# 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, +# 2006, 2007 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # |