Mercurial > emacs

diff man/ChangeLog @ 82140:b98604865ea0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 70-73) - Update from CVS 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
author Miles Bader <miles@gnu.org>
date Thu, 26 Jul 2007 05:28:10 +0000
parents d8cdd93afcc4 6749652ce564
children f04985ac29f2
line wrap: on
line diff
--- a/man/ChangeLog	Thu Jul 26 05:25:19 2007 +0000
+++ b/man/ChangeLog	Thu Jul 26 05:28:10 2007 +0000
@@ -2,6 +2,13 @@
 
 	* dired.texi (Wdired): Mention C-x C-q key binding.
 
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+	* calc.texi (Copying)
+	* emacs.texi (Copying): Replace license with GPLv3.
+
+	* Relicense all FSF files to GPLv3 or later.
+
 2007-07-24  Glenn Morris  <rgm@gnu.org>
 
 	* calendar.texi (Writing Calendar Files): cal-tex-diary etc only work
@@ -8100,7 +8107,7 @@
 
   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)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,