diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
tree | 258514dac7faab41642d8f319eb113c8a5f09690 /msdos | |
parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz |
Merge from emacs-23
Diffstat (limited to 'msdos')
-rw-r--r-- | msdos/INSTALL | 2 | ||||
-rw-r--r-- | msdos/README | 4 | ||||
-rw-r--r-- | msdos/mainmake.v2 | 2 | ||||
-rw-r--r-- | msdos/sed1v2.inp | 4 | ||||
-rw-r--r-- | msdos/sed2v2.inp | 2 | ||||
-rw-r--r-- | msdos/sed2x.inp | 4 | ||||
-rw-r--r-- | msdos/sed3v2.inp | 2 | ||||
-rw-r--r-- | msdos/sed4.inp | 2 | ||||
-rw-r--r-- | msdos/sed5x.inp | 4 | ||||
-rw-r--r-- | msdos/sed6.inp | 2 | ||||
-rw-r--r-- | msdos/sedalloc.inp | 2 | ||||
-rw-r--r-- | msdos/sedlisp.inp | 2 |
12 files changed, 16 insertions, 16 deletions
diff --git a/msdos/INSTALL b/msdos/INSTALL index bbe4b9e5c51..21628576415 100644 --- a/msdos/INSTALL +++ b/msdos/INSTALL @@ -1,7 +1,7 @@ GNU Emacs Installation Guide for the DJGPP (a.k.a. MS-DOS) port Copyright (C) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2003, 2004, -2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. The DJGPP port of GNU Emacs builds and runs on plain DOS and also on diff --git a/msdos/README b/msdos/README index da0cf0801ae..b1b47a2ab0b 100644 --- a/msdos/README +++ b/msdos/README @@ -1,4 +1,4 @@ -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -12,7 +12,7 @@ Windows 3.X. Since these are binary files, their copyright notice is reproduced here: # Copyright (C) 1993, 2002, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index 8965f746a6d..84be4c660a7 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, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This file is part of GNU Emacs. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index e2384ef2866..f778303eb20 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, 2001, 2002, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp index 556764423b9..42f144d08bd 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, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp index d17dd85ace6..e37c8d568b8 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, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -# 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 4a19d36a581..911166da47a 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed4.inp b/msdos/sed4.inp index 5f64c5f9399..fdd3ef0b863 100644 --- a/msdos/sed4.inp +++ b/msdos/sed4.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp index e706b785d7b..ffc0d06198b 100644 --- a/msdos/sed5x.inp +++ b/msdos/sed5x.inp @@ -2,8 +2,8 @@ # Configuration script for oldxmenu/makefile for DesqView/X # ---------------------------------------------------------------------- # -# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, -# 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sed6.inp b/msdos/sed6.inp index 2382971c30c..d3e644e9757 100644 --- a/msdos/sed6.inp +++ b/msdos/sed6.inp @@ -4,7 +4,7 @@ # --------------------------------------------------------------------------- # # Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedalloc.inp b/msdos/sedalloc.inp index 4546ea9e2a9..63d2f984576 100644 --- a/msdos/sedalloc.inp +++ b/msdos/sedalloc.inp @@ -2,7 +2,7 @@ # Configuration script for SYSTEM_MALLOC/REL_ALLOC in src/config.h # ---------------------------------------------------------------------- # -# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp index 152dafbaa39..9d5afc76eee 100644 --- a/msdos/sedlisp.inp +++ b/msdos/sedlisp.inp @@ -3,7 +3,7 @@ # ---------------------------------------------------------------------- # # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # |