aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.1
diff options
context:
space:
mode:
authorGlenn Morris2007-02-11 00:15:39 +0000
committerGlenn Morris2007-02-11 00:15:39 +0000
commit7f6d64f85a9bd86a15eeba8aa828b3f8a2e1d935 (patch)
treef90f40a5a475df6b670ab287990735f67960d18c /src/ChangeLog.1
parentdb3788ea1b767860abdf5459f873bf2c9d549e63 (diff)
downloademacs-7f6d64f85a9bd86a15eeba8aa828b3f8a2e1d935.tar.gz
emacs-7f6d64f85a9bd86a15eeba8aa828b3f8a2e1d935.zip
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 @@
3523 3523
3524 Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007 3524 Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007
3525 Free Software Foundation, Inc. 3525 Free Software Foundation, Inc.
3526 Copying and distribution of this file, with or without modification, 3526
3527 are permitted provided the copyright notice and this notice are preserved. 3527 This file is part of GNU Emacs.
3528
3529 GNU Emacs is free software; you can redistribute it and/or modify
3530 it under the terms of the GNU General Public License as published by
3531 the Free Software Foundation; either version 2, or (at your option)
3532 any later version.
3533
3534 GNU Emacs is distributed in the hope that it will be useful,
3535 but WITHOUT ANY WARRANTY; without even the implied warranty of
3536 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3537 GNU General Public License for more details.
3538
3539 You should have received a copy of the GNU General Public License
3540 along with GNU Emacs; see the file COPYING. If not, write to the
3541 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
3542 Boston, MA 02110-1301, USA.
3528 3543
3529;;; arch-tag: 2d2c1086-b0a5-437c-bc58-fb38ce2e0f9b 3544;;; arch-tag: 2d2c1086-b0a5-437c-bc58-fb38ce2e0f9b