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 /oldXMenu | |
| 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 'oldXMenu')
| -rw-r--r-- | oldXMenu/Activate.c | 2 | ||||
| -rw-r--r-- | oldXMenu/ChangeLog | 6 | ||||
| -rw-r--r-- | oldXMenu/Create.c | 2 | ||||
| -rw-r--r-- | oldXMenu/Internal.c | 2 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 2 | ||||
| -rw-r--r-- | oldXMenu/descrip.mms | 2 | ||||
| -rw-r--r-- | oldXMenu/insque.c | 2 |
7 files changed, 11 insertions, 7 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index 7bca8665ea2..0fb404675b9 100644 --- a/oldXMenu/Activate.c +++ b/oldXMenu/Activate.c | |||
| @@ -8,7 +8,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 | |||
| 8 | 8 | ||
| 9 | This program is free software; you can redistribute it and/or modify | 9 | This program is free software; you can redistribute it and/or modify |
| 10 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
| 11 | the Free Software Foundation; either version 2, or (at your option) | 11 | the Free Software Foundation; either version 3, or (at your option) |
| 12 | any later version. | 12 | any later version. |
| 13 | 13 | ||
| 14 | This program is distributed in the hope that it will be useful, | 14 | This program is distributed in the hope that it will be useful, |
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 95fe90f5e64..0997c75096d 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/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-04 Ulrich Mueller <ulm@gentoo.org> (tiny change) | 5 | 2007-06-04 Ulrich Mueller <ulm@gentoo.org> (tiny change) |
| 2 | 6 | ||
| 3 | * ChgPane.c, ChgSel.c: Quiet --with-x-toolkit=no | 7 | * ChgPane.c, ChgSel.c: Quiet --with-x-toolkit=no |
| @@ -475,7 +479,7 @@ | |||
| 475 | 479 | ||
| 476 | GNU Emacs is free software; you can redistribute it and/or modify | 480 | GNU Emacs is free software; you can redistribute it and/or modify |
| 477 | it under the terms of the GNU General Public License as published by | 481 | it under the terms of the GNU General Public License as published by |
| 478 | the Free Software Foundation; either version 2, or (at your option) | 482 | the Free Software Foundation; either version 3, or (at your option) |
| 479 | any later version. | 483 | any later version. |
| 480 | 484 | ||
| 481 | GNU Emacs is distributed in the hope that it will be useful, | 485 | GNU Emacs is distributed in the hope that it will be useful, |
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index 11044a66bee..78d8cd9c049 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c | |||
| @@ -8,7 +8,7 @@ Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, | |||
| 8 | 8 | ||
| 9 | This program is free software; you can redistribute it and/or modify | 9 | This program is free software; you can redistribute it and/or modify |
| 10 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
| 11 | the Free Software Foundation; either version 2, or (at your option) | 11 | the Free Software Foundation; either version 3, or (at your option) |
| 12 | any later version. | 12 | any later version. |
| 13 | 13 | ||
| 14 | This program is distributed in the hope that it will be useful, | 14 | This program is distributed in the hope that it will be useful, |
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c index 6ab4ed8ff8b..e63970e141b 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c | |||
| @@ -8,7 +8,7 @@ Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006, | |||
| 8 | 8 | ||
| 9 | This program is free software; you can redistribute it and/or modify | 9 | This program is free software; you can redistribute it and/or modify |
| 10 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
| 11 | the Free Software Foundation; either version 2, or (at your option) | 11 | the Free Software Foundation; either version 3, or (at your option) |
| 12 | any later version. | 12 | any later version. |
| 13 | 13 | ||
| 14 | This program is distributed in the hope that it will be useful, | 14 | This program is distributed in the hope that it will be useful, |
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index ddbb5b7d315..318cde3ad0b 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | ## This program is free software; you can redistribute it and/or modify | 21 | ## This program is free software; you can redistribute it and/or modify |
| 22 | ## it under the terms of the GNU General Public License as published by | 22 | ## it under the terms of the GNU General Public License as published by |
| 23 | ## the Free Software Foundation; either version 2, or (at your option) | 23 | ## the Free Software Foundation; either version 3, or (at your option) |
| 24 | ## any later version. | 24 | ## any later version. |
| 25 | ## | 25 | ## |
| 26 | ## This program is distributed in the hope that it will be useful, | 26 | ## This program is distributed in the hope that it will be useful, |
diff --git a/oldXMenu/descrip.mms b/oldXMenu/descrip.mms index 71ae9c203bf..c5d7a678fc3 100644 --- a/oldXMenu/descrip.mms +++ b/oldXMenu/descrip.mms | |||
| @@ -7,7 +7,7 @@ | |||
| 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, 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 | ## This program is distributed in the hope that it will be useful, | 13 | ## This program is distributed in the hope that it will be useful, |
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c index 66b442ea29b..ec7aa88dbbf 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | This program is free software; you can redistribute it and/or modify | 4 | This program is free software; you can redistribute it and/or modify |
| 5 | it under the terms of the GNU General Public License as published by | 5 | it under the terms of the GNU General Public License as published by |
| 6 | the Free Software Foundation; either version 2, or (at your option) | 6 | the Free Software Foundation; either version 3, or (at your option) |
| 7 | any later version. | 7 | any later version. |
| 8 | 8 | ||
| 9 | This program is distributed in the hope that it will be useful, | 9 | This program is distributed in the hope that it will be useful, |