Merge from emacs--devo--0

[gnu-emacs] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index 964e7ba90377efd78875e3389468cfd053905171..5a59c69003e5150c2c1dd12493ee1e5305caaac9 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -6,7 +6,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,