summaryrefslogtreecommitdiff
path: root/src/ChangeLog.1
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2007-02-11 00:15:39 +0000
committerGlenn Morris <rgm@gnu.org>2007-02-11 00:15:39 +0000
commit7f6d64f85a9bd86a15eeba8aa828b3f8a2e1d935 (patch)
treef90f40a5a475df6b670ab287990735f67960d18c /src/ChangeLog.1
parentdb3788ea1b767860abdf5459f873bf2c9d549e63 (diff)
downloademacs-7f6d64f85a9bd86a15eeba8aa828b3f8a2e1d935.tar.gz
Switch to standard GPL text for license.
Diffstat (limited to 'src/ChangeLog.1')
-rw-r--r--src/ChangeLog.119
1 files changed, 17 insertions, 2 deletions
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index f2559301f0a..d51791d9360 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3523,7 +3523,22 @@
Copyright (C) 1985, 1986, 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: 2d2c1086-b0a5-437c-bc58-fb38ce2e0f9b