Merge from emacs--devo--0

[gnu-emacs] / src / coding.c

diff --git a/src/coding.c b/src/coding.c
index 52fe696b23d3a6e9161a2252384582838bc907d6..e2ce0c9f8de7a2b8d87ddd726639a382f6b4af0e 100644 (file)
--- a/src/coding.c
+++ b/src/coding.c
@@ -10,7 +10,7 @@ This file is part of GNU Emacs.
 
 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,