diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-01-02 15:31:19 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-02 15:31:19 -0500 |
| commit | 7c420169baa7c50428589cca7f8eda71b462eb15 (patch) | |
| tree | b556f9e181818bbaf8b5b425844b4ae26e88f537 /nextstep | |
| parent | bb7f5cbcda931661c8dc3311603ac764fa87a639 (diff) | |
| parent | d12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f (diff) | |
| download | emacs-7c420169baa7c50428589cca7f8eda71b462eb15.tar.gz | |
Merge changes from emacs-23 branch
Diffstat (limited to 'nextstep')
4 files changed, 11 insertions, 4 deletions
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog index ac060bbcee4..26d22b4c90e 100644 --- a/nextstep/ChangeLog +++ b/nextstep/ChangeLog @@ -1,3 +1,10 @@ +2011-01-02 Glenn Morris <rgm@gnu.org> + + * Cocoa/Emacs.base/Contents/Info.plist: + * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: + * GNUstep/Emacs.base/Resources/Info-gnustep.plist: + Set short copyright year to 2011. + 2010-10-13 Glenn Morris <rgm@gnu.org> * README: Remove information duplicated in AUTHORS. diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist index f064a1248ea..7d95a4b0936 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist +++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist @@ -1,5 +1,5 @@ <!-- -Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -553,7 +553,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. <key>CFBundleExecutable</key> <string>Emacs</string> <key>CFBundleGetInfoString</key> - <string>Emacs 24.0.50 Copyright (C) 2010 Free Software Foundation, Inc.</string> + <string>Emacs 24.0.50 Copyright (C) 2011 Free Software Foundation, Inc.</string> <key>CFBundleIconFile</key> <string>Emacs.icns</string> <key>CFBundleIdentifier</key> diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings index 197e42cb6fb..95bc8ad83e6 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings @@ -3,4 +3,4 @@ CFBundleName = "Emacs"; CFBundleShortVersionString = "Version 24.0.50"; CFBundleGetInfoString = "Emacs version 24.0.50, NS Windowing"; -NSHumanReadableCopyright = "Copyright (C) 2010 Free Software Foundation, Inc."; +NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist index ade3f0117e6..e92d45ae686 100644 --- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist +++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist @@ -11,7 +11,7 @@ "Carl Edman (NeXTStep)", "..see http://emacs-app.sf.net/authorship.html" ); - Copyright = "Copyright (C) 2010 Free Software Foundation, Inc."; + Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; FullVersionID = "Emacs 24.0.50, NS Windowing"; NSExecutable = Emacs; |