diff options
author | Glenn Morris <rgm@gnu.org> | 2007-02-11 01:18:25 +0000 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2007-02-11 01:18:25 +0000 |
commit | 5b87ad554026d3e588ffe56f112f1e56b47b763b (patch) | |
tree | 6186cc803f4ce50ae5b599b6ccc449d84ac2d62c /lisp/ChangeLog.1 | |
parent | bd9bb96e15cb9c36523210260a6d863a1606eb89 (diff) | |
download | emacs-5b87ad554026d3e588ffe56f112f1e56b47b763b.tar.gz |
Switch to standard GPL text for license.
Diffstat (limited to 'lisp/ChangeLog.1')
-rw-r--r-- | lisp/ChangeLog.1 | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1 index 76f9040c989..e068ee4cffb 100644 --- a/lisp/ChangeLog.1 +++ b/lisp/ChangeLog.1 @@ -3247,8 +3247,23 @@ in case user's init file has changed them. 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. + 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: b6060738-7fac-4c9c-80ae-67995bae78a7 |