summaryrefslogtreecommitdiff
path: root/lisp/ChangeLog.2
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2007-02-11 01:18:25 +0000
committerGlenn Morris <rgm@gnu.org>2007-02-11 01:18:25 +0000
commitfe7d55b72664d0ac306404fba6567f9327c0ebe6 (patch)
treef1f41cbdb370a94ccaca8cebe687f86d93abdcf5 /lisp/ChangeLog.2
parent4fdedb9ec8db6de70cf9adcdc9fb05dac895eda0 (diff)
downloademacs-fe7d55b72664d0ac306404fba6567f9327c0ebe6.tar.gz
Switch to standard GPL text for license.
Diffstat (limited to 'lisp/ChangeLog.2')
-rw-r--r--lisp/ChangeLog.223
1 files changed, 19 insertions, 4 deletions
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index af450e18cd2..fd3d0a16b47 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -3994,9 +3994,24 @@
See ChangeLog.1 for earlier changes.
- Copyright (C) 1986, 1987, 1988, 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) 1986, 1987, 1988, 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: c315ba16-14ba-4b07-86e6-013a18f11be7