[Emacs-diffs] Changes to emacs/etc/ERC-NEWS,v

[Glenn Morris]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       07/02/11 00:53:48

Index: ERC-NEWS
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/ERC-NEWS,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ERC-NEWS    1 Feb 2007 03:03:06 -0000       1.11
+++ ERC-NEWS    11 Feb 2007 00:53:48 -0000      1.12
@@ -1,8 +1,7 @@
 ERC NEWS                                                       -*- outline -*-
 
 Copyright (C) 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.
+See the end of the file for license conditions.
 
 
 * Changes in ERC 5.2 (stable pre-release for Emacs 22)
@@ -849,4 +848,22 @@
 'erc-stamp), you can customize the variable `erc-timestamp-mode', and
 the rest should be automatic.
 
+
+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: 2b21b387-6cdc-4192-889c-6743cfffdcb1