Merge from emacs--devo--0

[bpt/emacs.git] / lisp / ChangeLog.4

diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index 872a39f..1db8ba2 100644 (file)
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -8946,7 +8946,7 @@ See ChangeLog.3 for earlier changes.
 
   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,