diff msdos/ChangeLog @ 90751:52a7f3f50b89

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 624-636) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 200-201) - Merge from emacs--devo--0 - Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-171
author Miles Bader <miles@gnu.org>
date Tue, 13 Feb 2007 12:14:16 +0000
parents f83d17e1ace6 92a0e87ff562
children e9f94688a064
line wrap: on
line diff
--- a/msdos/ChangeLog	Mon Feb 12 02:58:27 2007 +0000
+++ b/msdos/ChangeLog	Tue Feb 13 12:14:16 2007 +0000
@@ -1,3 +1,8 @@
+2007-02-10  Glenn Morris  <rgm@gnu.org>
+
+	* COPYING.DJ: Remove file since it is no longer needed (see README
+	for details).
+
 2007-01-28  Glenn Morris  <rgm@gnu.org>
 
 	* COPYING.DJ: New file.
@@ -45,8 +50,7 @@
 	and extraclean.
 	(.PHONY): Add bootfast.
 	(bootstrap): Make bootstrap-after in lisp.
-	(bootstrap-clean-before): Clean in man, lispref, and lispintro as
-	well.
+	(bootstrap-clean-before): Clean in man, lispref, and lispintro as well.
 
 	* sed2v2.inp (HAVE_BZERO): Define for GCC v3.x and later.
 
@@ -405,7 +409,7 @@
 
 	* sed2.inp: (EMACS_CONFIGURATION): Set to i386-pc-msdosdjgpp.
 
-1997-08-10 +03  Eli Zaretskii  <eliz@is.elta.co.il>
+1997-08-10  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* sed1v2.inp (CPPFLAGS, LDFLAGS): Edit to empty.
 
@@ -634,7 +638,22 @@
 
     Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
        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.
+
+  This file is part of GNU Emacs.
+
+  GNU Emacs is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2, or (at your option)
+  any later version.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
 
 ;;; arch-tag: b602fbb5-3776-4053-8de2-03da33c29d44