diff etc/MH-E-NEWS @ 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 95d0cdf160ea dc23aaa67696
children f55f9811f5d7
line wrap: on
line diff
--- a/etc/MH-E-NEWS	Mon Feb 12 02:58:27 2007 +0000
+++ b/etc/MH-E-NEWS	Tue Feb 13 12:14:16 2007 +0000
@@ -1,11 +1,9 @@
 * COPYRIGHT
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-Free Software Foundation, Inc.
-	
-Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
 
 * Changes in MH-E 8.0.3
 
@@ -3120,6 +3118,24 @@
 *** `mh-clean-message-header': find end of headers even if no body.
 
 
+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.
+
+
 Local variables:
 mode: outline
 paragraph-separate: "[ 	]*$"