diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-27 10:52:18 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-27 10:52:18 +0000 |
| commit | 1cb21c8ead36b165fee8c502039cee23ecfd9c10 (patch) | |
| tree | 1251acb5a614f202f45a7cb579ef3af39623732f /etc/emacs.py | |
| parent | 46cbff4ce222d6a5abebc8567efbc50ac7647988 (diff) | |
| parent | a92cecdac0c9cddf3910557a6ed5e055c0966058 (diff) | |
| download | emacs-1cb21c8ead36b165fee8c502039cee23ecfd9c10.tar.gz | |
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
Diffstat (limited to 'etc/emacs.py')
| -rw-r--r-- | etc/emacs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/emacs.py b/etc/emacs.py index 0d0f2e75ed3..f11913cd7b5 100644 --- a/etc/emacs.py +++ b/etc/emacs.py @@ -7,7 +7,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, |