Mercurial > emacs
comparison lisp/gnus/nndiary.el @ 82140:b98604865ea0
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 70-73)
- Update from CVS
2007-07-25 Glenn Morris <rgm@gnu.org>
* Relicense all FSF files to GPLv3 or later.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 26 Jul 2007 05:28:10 +0000 |
parents | 1bba1a22d0d0 a256b36feef6 |
children | a3c27999decb |
comparison
equal
deleted
inserted
replaced
82139:fe7fdfee34ac | 82140:b98604865ea0 |
---|---|
10 | 10 |
11 ;; This file is part of GNU Emacs. | 11 ;; This file is part of GNU Emacs. |
12 | 12 |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | 13 ;; GNU Emacs is free software; you can redistribute it and/or modify |
14 ;; it under the terms of the GNU General Public License as published by | 14 ;; it under the terms of the GNU General Public License as published by |
15 ;; the Free Software Foundation; either version 2 of the License, or | 15 ;; the Free Software Foundation; either version 3, or (at your option) |
16 ;; (at your option) any later version. | 16 ;; any later version. |
17 | 17 |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | 18 ;; GNU Emacs is distributed in the hope that it will be useful, |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
21 ;; GNU General Public License for more details. | 21 ;; GNU General Public License for more details. |
22 | 22 |
23 ;; You should have received a copy of the GNU General Public License | 23 ;; You should have received a copy of the GNU General Public License |
24 ;; along with this program; if not, write to the Free Software | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
25 ;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; MA 02110-1301, USA. | 26 ;; Boston, MA 02110-1301, USA. |
27 | 27 |
28 | 28 |
29 ;;; Commentary: | 29 ;;; Commentary: |
30 | 30 |
31 ;; Contents management by FCM version 0.1. | 31 ;; Contents management by FCM version 0.1. |