diff options
author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:07 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:07 -0800 |
commit | 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch) | |
tree | fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /oldXMenu | |
parent | c043d9731b499a241830d705e9055c9e42ccf28c (diff) | |
parent | ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff) |
Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
Diffstat (limited to 'oldXMenu')
-rw-r--r-- | oldXMenu/Activate.c | 2 | ||||
-rw-r--r-- | oldXMenu/ChangeLog.1 | 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/deps.mk | 2 | ||||
-rw-r--r-- | oldXMenu/insque.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c index 5de157eba1..1e2b1980c7 100644 --- a/oldXMenu/Activate.c +++ b/oldXMenu/Activate.c @@ -3,7 +3,7 @@ #include "copyright.h" /* -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 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/ChangeLog.1 b/oldXMenu/ChangeLog.1 index 52b873a65b..ad8f727372 100644 --- a/oldXMenu/ChangeLog.1 +++ b/oldXMenu/ChangeLog.1 @@ -712,7 +712,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2015 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c index 32bc6a7563..d0cf8f09f8 100644 --- a/oldXMenu/Create.c +++ b/oldXMenu/Create.c @@ -3,7 +3,7 @@ #include "copyright.h" /* -Copyright (C) 1993-1994, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1993-1994, 2001-2016 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 8847a4200f..84c865163b 100644 --- a/oldXMenu/FindSel.c +++ b/oldXMenu/FindSel.c @@ -3,7 +3,7 @@ #include "copyright.h" /* -Copyright (C) 2001-2015 Free Software Foundation, Inc. +Copyright (C) 2001-2016 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 3453c64f11..f25c96368c 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c @@ -3,7 +3,7 @@ #include "copyright.h" /* -Copyright (C) 1993, 1996, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1993, 1996, 2001-2016 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 71dd5663f4..a695e73157 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -15,7 +15,7 @@ ## without express or implied warranty. -## Copyright (C) 2001-2015 Free Software Foundation, Inc. +## Copyright (C) 2001-2016 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/deps.mk b/oldXMenu/deps.mk index 54ce358757..4616a7cd80 100644 --- a/oldXMenu/deps.mk +++ b/oldXMenu/deps.mk @@ -15,7 +15,7 @@ ## without express or implied warranty. -## Copyright (C) 2001-2015 Free Software Foundation, Inc. +## Copyright (C) 2001-2016 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 a20941e4fc..248eeafce6 100644 --- a/oldXMenu/insque.c +++ b/oldXMenu/insque.c @@ -1,5 +1,5 @@ /* -Copyright (C) 1993-1998, 2001-2015 Free Software Foundation, Inc. +Copyright (C) 1993-1998, 2001-2016 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 |