diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /oldXMenu | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/Activate.c | 2 | ||||
| -rw-r--r-- | oldXMenu/ChangeLog | 2 | ||||
| -rw-r--r-- | oldXMenu/Create.c | 2 | ||||
| -rw-r--r-- | oldXMenu/FindSel.c | 2 | ||||
| -rw-r--r-- | oldXMenu/Internal.c | 2 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 2 | ||||
| -rw-r--r-- | oldXMenu/insque.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index 51ffc47f0c9..8f1b5484061 100644 --- a/oldXMenu/Activate.c +++ b/oldXMenu/Activate.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include "copyright.h" | 3 | #include "copyright.h" |
| 4 | 4 | ||
| 5 | /* | 5 | /* |
| 6 | Copyright (C) 2001-2012 Free Software Foundation, Inc. | 6 | Copyright (C) 2001-2013 Free Software Foundation, Inc. |
| 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 |
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 3601b980ab0..8f2951700e8 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog | |||
| @@ -649,7 +649,7 @@ | |||
| 649 | ;; coding: utf-8 | 649 | ;; coding: utf-8 |
| 650 | ;; End: | 650 | ;; End: |
| 651 | 651 | ||
| 652 | Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. | 652 | Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc. |
| 653 | 653 | ||
| 654 | This file is part of GNU Emacs. | 654 | This file is part of GNU Emacs. |
| 655 | 655 | ||
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index 6dda7d44ef4..a72f12e5b03 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include "copyright.h" | 3 | #include "copyright.h" |
| 4 | 4 | ||
| 5 | /* | 5 | /* |
| 6 | Copyright (C) 1993-1994, 2001-2012 Free Software Foundation, Inc. | 6 | Copyright (C) 1993-1994, 2001-2013 Free Software Foundation, Inc. |
| 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 |
diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c index 3c208cb3da5..c4d871aaefa 100644 --- a/oldXMenu/FindSel.c +++ b/oldXMenu/FindSel.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include "copyright.h" | 3 | #include "copyright.h" |
| 4 | 4 | ||
| 5 | /* | 5 | /* |
| 6 | Copyright (C) 2001-2012 Free Software Foundation, Inc. | 6 | Copyright (C) 2001-2013 Free Software Foundation, Inc. |
| 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 |
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c index ee1e88b396e..67651c276c1 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | #include "copyright.h" | 3 | #include "copyright.h" |
| 4 | 4 | ||
| 5 | /* | 5 | /* |
| 6 | Copyright (C) 1993, 1996, 2001-2012 Free Software Foundation, Inc. | 6 | Copyright (C) 1993, 1996, 2001-2013 Free Software Foundation, Inc. |
| 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 |
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index ee78325f0d7..f4fda56e28d 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | ## without express or implied warranty. | 15 | ## without express or implied warranty. |
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | ## Copyright (C) 2001-2012 Free Software Foundation, Inc. | 18 | ## Copyright (C) 2001-2013 Free Software Foundation, Inc. |
| 19 | 19 | ||
| 20 | ## This program is free software: you can redistribute it and/or modify | 20 | ## This program is free software: you can redistribute it and/or modify |
| 21 | ## it under the terms of the GNU General Public License as published by | 21 | ## it under the terms of the GNU General Public License as published by |
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c index 0e6904ea9bf..c31bd814089 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright (C) 1993-1998, 2001-2012 Free Software Foundation, Inc. | 2 | Copyright (C) 1993-1998, 2001-2013 Free Software Foundation, Inc. |
| 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 |