Merge from emacs--devo--0

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index b036ea11c3399e86cc14663636fd9310abc7300d..51332e21cdc24248ddec1236e88baf3c68b6471c 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,7 +1,19 @@
+2007-07-25  Glenn Morris  <rgm@gnu.org>
+
+       * Relicense all FSF files to GPLv3 or later.
+
+2007-06-07  Glenn Morris  <rgm@gnu.org>
+
+       * admin.el (set-copyright): New function.
+
 2007-04-25  Nick Roberts  <nickrob@snap.net.nz>
 
        * make-tarball.txt: Add note about cutting the branch.
 
+2007-06-02  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Version 22.1 released.
+
 2007-02-03  Eli Zaretskii  <eliz@gnu.org>
 
        * nt/makedist.bat: Change EOL format to DOS.  Don't use
@@ -425,7 +437,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,