diff options
author | Miles Bader <miles@gnu.org> | 2007-08-03 05:20:51 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-08-03 05:20:51 +0000 |
commit | e145a7fe95fb8f97407d125f94653ef95e42696d (patch) | |
tree | 4f83705aac9d1a4416dabcf774115f7cccb80bda /lisp/mb-depth.el | |
parent | 2a4924ce174b1a2b032558f3036f1d95445c4936 (diff) | |
parent | 2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca (diff) | |
download | emacs-e145a7fe95fb8f97407d125f94653ef95e42696d.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 832-838)
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Update from CVS
- Restore lisp/emacs-lisp/cl-loaddefs.el
- Merge from emacs--rel--22
* emacs--rel--22 (patch 75-83)
- Update from CVS
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Indicate that emacs--devo--0--patch-834 does not need to be applied
- Merge from gnus--rel--5.10
- Restore lisp/emacs-lisp/cl-loaddefs.el
* gnus--rel--5.10 (patch 239-241)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239
Diffstat (limited to 'lisp/mb-depth.el')
-rw-r--r-- | lisp/mb-depth.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/mb-depth.el b/lisp/mb-depth.el index 256c7ee6a99..1d125e45d95 100644 --- a/lisp/mb-depth.el +++ b/lisp/mb-depth.el @@ -9,7 +9,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, |