Merge from emacs--devo--0

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index 855d2322412c9d27b5dafc39ad233c5e2bba10a7..d76ed658de64bc8160b5c1e13d2eee5a57a8396c 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.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,