Mercurial > emacs
diff src/composite.c @ 90996:f55f9811f5d7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-831)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 70-74)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 27 Jul 2007 10:52:18 +0000 |
parents | 3619e7770f2e b98604865ea0 |
children | 17bc979cf2b7 |
line wrap: on
line diff
--- a/src/composite.c Thu Jul 26 11:44:52 2007 +0000 +++ b/src/composite.c Fri Jul 27 10:52:18 2007 +0000 @@ -12,7 +12,7 @@ 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,