diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
tree | 258514dac7faab41642d8f319eb113c8a5f09690 /oldXMenu | |
parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz |
Merge from emacs-23
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 | 4 | ||||
-rw-r--r-- | oldXMenu/insque.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index 55bfca510b9..118024170eb 100644 --- a/oldXMenu/Activate.c +++ b/oldXMenu/Activate.c @@ -3,7 +3,7 @@ #include "copyright.h" /* -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 329a4ac9565..c3065524b51 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -573,7 +573,7 @@ ;; End: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index f96e077a466..fc979ad948f 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c @@ -4,7 +4,7 @@ /* Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, - 2008, 2009, 2010 Free Software Foundation, Inc. + 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c index 202bbc1b28c..4d143b5f3b9 100644 --- a/oldXMenu/FindSel.c +++ b/oldXMenu/FindSel.c @@ -4,7 +4,7 @@ /* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010 Free Software Foundation, Inc. + 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c index cb87dd650c7..34615e8ed16 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c @@ -4,7 +4,7 @@ /* Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 8acfee07fd0..cf97f740af4 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -15,8 +15,8 @@ ## without express or implied warranty. -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -## 2010 Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +## Free Software Foundation, Inc. ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c index c6f8f6ef1fb..f5c30f28ff4 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c @@ -1,6 +1,6 @@ /* Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, - 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |