diff options
| author | Miles Bader | 2007-07-31 05:50:45 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-31 05:50:45 +0000 |
| commit | 9899d01a0ccec166e04caa60657a44e614be50cd (patch) | |
| tree | 6f7874938065fd9808765059213ff7a94ab3268b /lib-src/b2m.pl | |
| parent | 96157d113ae5828cc280488211610db1960d572c (diff) | |
| parent | 2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca (diff) | |
| download | emacs-9899d01a0ccec166e04caa60657a44e614be50cd.tar.gz emacs-9899d01a0ccec166e04caa60657a44e614be50cd.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-838)
- Update from CVS
- Merge from emacs--rel--22
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Restore lisp/emacs-lisp/cl-loaddefs.el
* emacs--rel--22 (patch 70-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--multi-tty--0--patch-28
Diffstat (limited to 'lib-src/b2m.pl')
| -rw-r--r-- | lib-src/b2m.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl index 39c5901348f..96f1643891f 100644 --- a/lib-src/b2m.pl +++ b/lib-src/b2m.pl | |||
| @@ -7,8 +7,8 @@ | |||
| 7 | 7 | ||
| 8 | # This program is free software; you can redistribute it and/or modify | 8 | # This program is free software; you can redistribute it and/or modify |
| 9 | # it under the terms of the GNU General Public License as published by | 9 | # it under the terms of the GNU General Public License as published by |
| 10 | # the Free Software Foundation; either version 2 of the License, or | 10 | # the Free Software Foundation; either version 3, or (at your option) |
| 11 | # (at your option) any later version. | 11 | # any later version. |
| 12 | 12 | ||
| 13 | # This program is distributed in the hope that it will be useful, but | 13 | # This program is distributed in the hope that it will be useful, but |
| 14 | # WITHOUT ANY WARRANTY; without even the implied warranty of | 14 | # WITHOUT ANY WARRANTY; without even the implied warranty of |
| @@ -16,9 +16,9 @@ | |||
| 16 | # General Public License for more details. | 16 | # General Public License for more details. |
| 17 | 17 | ||
| 18 | # You should have received a copy of the GNU General Public License | 18 | # You should have received a copy of the GNU General Public License |
| 19 | # along with this program; if not, write to the Free Software | 19 | # along with this program; see the file COPYING. If not, write to the |
| 20 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 | 20 | # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 21 | # USA. | 21 | # Boston, MA 02110-1301 USA. |
| 22 | 22 | ||
| 23 | # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>. | 23 | # Maintained by Jonathan Kamens <jik@kamens.brookline.ma.us>. |
| 24 | 24 | ||