Merge from emacs--devo--0

[gnu-emacs] / src / ChangeLog.2

diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 420688ac3856f3efe9d71780c14edfc92add44a7..1e903fbfa728a66b1aad80860131dbc92b5af8b4 100644 (file)
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4778,7 +4778,7 @@ See ChangeLog.1 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,