Merge from emacs--devo--0

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 7349efb172071f50281cdd0ff2bde90fa1d93705..51332e21cdc24248ddec1236e88baf3c68b6471c 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+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-06-07  Glenn Morris  <rgm@gnu.org>
 
        * admin.el (set-copyright): New function.


@@ -433,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
 
   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,
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,