diff options
| author | Miles Bader | 2007-07-26 05:28:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-26 05:28:10 +0000 |
| commit | 9aecacd08a93bffb529cee59d74477890ce96f37 (patch) | |
| tree | 149d4cef4deb6e93e300b6ef89322181a3d29ce4 /admin | |
| parent | 9ee365d565205366d61d9b50dd2a15ef903be983 (diff) | |
| parent | ef2805c29bb03f0c8c0d4b37a65f511123dcab1c (diff) | |
| download | emacs-9aecacd08a93bffb529cee59d74477890ce96f37.tar.gz emacs-9aecacd08a93bffb529cee59d74477890ce96f37.zip | |
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
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 6 | ||||
| -rw-r--r-- | admin/README | 2 | ||||
| -rw-r--r-- | admin/admin.el | 2 | ||||
| -rw-r--r-- | admin/alloc-colors.c | 2 | ||||
| -rwxr-xr-x | admin/build-configs | 2 | ||||
| -rw-r--r-- | admin/cus-test.el | 2 | ||||
| -rwxr-xr-x | admin/diff-tar-files | 2 | ||||
| -rwxr-xr-x | admin/make-announcement | 2 | ||||
| -rwxr-xr-x | admin/make-emacs | 2 | ||||
| -rw-r--r-- | admin/notes/copyright | 2 | ||||
| -rwxr-xr-x | admin/nt/makedist.bat | 2 | ||||
| -rwxr-xr-x | admin/quick-install-emacs | 2 | ||||
| -rwxr-xr-x | admin/revdiff | 2 |
13 files changed, 17 insertions, 13 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 7349efb1720..51332e21cdc 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-07-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Relicense all FSF files to GPLv3 or later. | ||
| 4 | |||
| 1 | 2007-06-07 Glenn Morris <rgm@gnu.org> | 5 | 2007-06-07 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * admin.el (set-copyright): New function. | 7 | * admin.el (set-copyright): New function. |
| @@ -433,7 +437,7 @@ | |||
| 433 | 437 | ||
| 434 | GNU Emacs is free software; you can redistribute it and/or modify | 438 | GNU Emacs is free software; you can redistribute it and/or modify |
| 435 | it under the terms of the GNU General Public License as published by | 439 | it under the terms of the GNU General Public License as published by |
| 436 | the Free Software Foundation; either version 2, or (at your option) | 440 | the Free Software Foundation; either version 3, or (at your option) |
| 437 | any later version. | 441 | any later version. |
| 438 | 442 | ||
| 439 | GNU Emacs is distributed in the hope that it will be useful, | 443 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/README b/admin/README index 8efcfa3224a..2c07f40b52f 100644 --- a/admin/README +++ b/admin/README | |||
| @@ -71,7 +71,7 @@ This file is part of GNU Emacs. | |||
| 71 | 71 | ||
| 72 | GNU Emacs is free software; you can redistribute it and/or modify | 72 | GNU Emacs is free software; you can redistribute it and/or modify |
| 73 | it under the terms of the GNU General Public License as published by | 73 | it under the terms of the GNU General Public License as published by |
| 74 | the Free Software Foundation; either version 2, or (at your option) | 74 | the Free Software Foundation; either version 3, or (at your option) |
| 75 | any later version. | 75 | any later version. |
| 76 | 76 | ||
| 77 | GNU Emacs is distributed in the hope that it will be useful, | 77 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/admin.el b/admin/admin.el index 175eb6ded1b..94e64a23de9 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | ;; GNU Emacs is free software; you can redistribute it and/or modify | 8 | ;; GNU Emacs 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, or (at your option) | 10 | ;; the Free Software Foundation; either version 3, or (at your option) |
| 11 | ;; any later version. | 11 | ;; any later version. |
| 12 | 12 | ||
| 13 | ;; GNU Emacs is distributed in the hope that it will be useful, | 13 | ;; GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index c336d808d58..22447643e5e 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c | |||
| @@ -6,7 +6,7 @@ This file is part of GNU Emacs. | |||
| 6 | 6 | ||
| 7 | GNU Emacs is free software; you can redistribute it and/or modify | 7 | GNU Emacs is free software; you can redistribute it and/or modify |
| 8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
| 9 | the Free Software Foundation; either version 2, or (at your option) | 9 | the Free Software Foundation; either version 3, or (at your option) |
| 10 | any later version. | 10 | any later version. |
| 11 | 11 | ||
| 12 | GNU Emacs is distributed in the hope that it will be useful, | 12 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/build-configs b/admin/build-configs index b99b5405075..f36a05ca701 100755 --- a/admin/build-configs +++ b/admin/build-configs | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | # | 7 | # |
| 8 | # GNU Emacs is free software; you can redistribute it and/or modify | 8 | # GNU Emacs 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, or (at your option) | 10 | # the Free Software Foundation; either version 3, or (at your option) |
| 11 | # any later version. | 11 | # any later version. |
| 12 | # | 12 | # |
| 13 | # GNU Emacs is distributed in the hope that it will be useful, | 13 | # GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/cus-test.el b/admin/cus-test.el index cba8e31ac89..ac0c7b37909 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el | |||
| @@ -12,7 +12,7 @@ | |||
| 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, or (at your option) | 15 | ;; the Free Software Foundation; either version 3, or (at your option) |
| 16 | ;; 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, |
diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 03b5a00a12f..18d95451751 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | # | 7 | # |
| 8 | # GNU Emacs is free software; you can redistribute it and/or modify | 8 | # GNU Emacs 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, or (at your option) | 10 | # the Free Software Foundation; either version 3, or (at your option) |
| 11 | # any later version. | 11 | # any later version. |
| 12 | # | 12 | # |
| 13 | # GNU Emacs is distributed in the hope that it will be useful, | 13 | # GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/make-announcement b/admin/make-announcement index 03a083e4c72..1c7b4574fea 100755 --- a/admin/make-announcement +++ b/admin/make-announcement | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | ## GNU Emacs is free software; you can redistribute it and/or modify | 10 | ## GNU Emacs is free software; you can redistribute it and/or modify |
| 11 | ## it under the terms of the GNU General Public License as published by | 11 | ## it under the terms of the GNU General Public License as published by |
| 12 | ## the Free Software Foundation; either version 2, or (at your option) | 12 | ## the Free Software Foundation; either version 3, or (at your option) |
| 13 | ## any later version. | 13 | ## any later version. |
| 14 | 14 | ||
| 15 | ## GNU Emacs is distributed in the hope that it will be useful, | 15 | ## GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/make-emacs b/admin/make-emacs index d6b14ca22b9..23b4e1c6374 100755 --- a/admin/make-emacs +++ b/admin/make-emacs | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | # | 7 | # |
| 8 | # GNU Emacs is free software; you can redistribute it and/or modify | 8 | # GNU Emacs 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, or (at your option) | 10 | # the Free Software Foundation; either version 3, or (at your option) |
| 11 | # any later version. | 11 | # any later version. |
| 12 | # | 12 | # |
| 13 | # GNU Emacs is distributed in the hope that it will be useful, | 13 | # GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/notes/copyright b/admin/notes/copyright index 91bf87f3b08..eeeca0fc813 100644 --- a/admin/notes/copyright +++ b/admin/notes/copyright | |||
| @@ -603,7 +603,7 @@ This file is part of GNU Emacs. | |||
| 603 | 603 | ||
| 604 | GNU Emacs is free software; you can redistribute it and/or modify | 604 | GNU Emacs is free software; you can redistribute it and/or modify |
| 605 | it under the terms of the GNU General Public License as published by | 605 | it under the terms of the GNU General Public License as published by |
| 606 | the Free Software Foundation; either version 2, or (at your option) | 606 | the Free Software Foundation; either version 3, or (at your option) |
| 607 | any later version. | 607 | any later version. |
| 608 | 608 | ||
| 609 | GNU Emacs is distributed in the hope that it will be useful, | 609 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat index 484ab88004c..87e151dd06a 100755 --- a/admin/nt/makedist.bat +++ b/admin/nt/makedist.bat | |||
| @@ -12,7 +12,7 @@ rem This file is part of GNU Emacs. | |||
| 12 | rem | 12 | rem |
| 13 | rem GNU Emacs is free software; you can redistribute it and/or modify | 13 | rem GNU Emacs is free software; you can redistribute it and/or modify |
| 14 | rem it under the terms of the GNU General Public License as published by | 14 | rem it under the terms of the GNU General Public License as published by |
| 15 | rem the Free Software Foundation; either version 2, or (at your option) | 15 | rem the Free Software Foundation; either version 3, or (at your option) |
| 16 | rem any later version. | 16 | rem any later version. |
| 17 | rem | 17 | rem |
| 18 | rem GNU Emacs is distributed in the hope that it will be useful, | 18 | rem GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index a6e70120e6d..e451cfcb2aa 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | ## GNU Emacs is free software; you can redistribute it and/or modify | 11 | ## GNU Emacs is free software; you can redistribute it and/or modify |
| 12 | ## it under the terms of the GNU General Public License as published by | 12 | ## it under the terms of the GNU General Public License as published by |
| 13 | ## the Free Software Foundation; either version 2, or (at your option) | 13 | ## the Free Software Foundation; either version 3, or (at your option) |
| 14 | ## any later version. | 14 | ## any later version. |
| 15 | 15 | ||
| 16 | ## GNU Emacs is distributed in the hope that it will be useful, | 16 | ## GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/admin/revdiff b/admin/revdiff index 78be1f62304..d9ea41782ba 100755 --- a/admin/revdiff +++ b/admin/revdiff | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | # | 7 | # |
| 8 | # GNU Emacs is free software; you can redistribute it and/or modify | 8 | # GNU Emacs 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, or (at your option) | 10 | # the Free Software Foundation; either version 3, or (at your option) |
| 11 | # any later version. | 11 | # any later version. |
| 12 | # | 12 | # |
| 13 | # GNU Emacs is distributed in the hope that it will be useful, | 13 | # GNU Emacs is distributed in the hope that it will be useful, |