diff lisp/ChangeLog.6 @ 75774:dc23aaa67696

Switch to standard GPL text for license.
author Glenn Morris <rgm@gnu.org>
date Sun, 11 Feb 2007 01:18:25 +0000
parents df15b3ed8eb1
children 592f41af203b 52a7f3f50b89
line wrap: on
line diff
--- a/lisp/ChangeLog.6	Sun Feb 11 01:14:59 2007 +0000
+++ b/lisp/ChangeLog.6	Sun Feb 11 01:18:25 2007 +0000
@@ -8022,9 +8022,25 @@
 
 See ChangeLog.5 for earlier changes.
 
-    Copyright (C) 1995, 1996, 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.
+    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+      2007  Free Software Foundation, Inc.
+
+  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: f90e8ffe-6bd0-4423-97d9-637ac4382520