diff options
| author | David Reitter | 2009-11-24 15:31:01 +0000 |
|---|---|---|
| committer | David Reitter | 2009-11-24 15:31:01 +0000 |
| commit | 35179414e41c6064b484854fbc01a9db6ce2a866 (patch) | |
| tree | 100aa54f57e606c5488206e8cabc1186ce5bdfd9 /nextstep | |
| parent | 605a20a98823768578d6faed5f04cb00e57da2bb (diff) | |
| download | emacs-35179414e41c6064b484854fbc01a9db6ce2a866.tar.gz emacs-35179414e41c6064b484854fbc01a9db6ce2a866.zip | |
vc-git-registered: use checkout directory (where .git is)
rather than the file's directory and a relative path spec to work around a bug in git.
Diffstat (limited to 'nextstep')
| -rw-r--r-- | nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings | 4 |
1 files changed, 3 insertions, 1 deletions
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 5934dedb611..f18751d2379 100644 --- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings +++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | /* Localized versions of Info.plist keys */ | ||
| 2 | 1 | ||
| 2 | <<<<<<< InfoPlist.strings | ||
| 3 | ======= | ||
| 3 | CFBundleName = "Emacs"; | 4 | CFBundleName = "Emacs"; |
| 4 | CFBundleShortVersionString = "Version 23.1.50"; | 5 | CFBundleShortVersionString = "Version 23.1.50"; |
| 5 | CFBundleGetInfoString = "Emacs version 23.1.50, NS Windowing"; | 6 | CFBundleGetInfoString = "Emacs version 23.1.50, NS Windowing"; |
| 6 | NSHumanReadableCopyright = "Copyright (C) 2009 Free Software Foundation, Inc."; | 7 | NSHumanReadableCopyright = "Copyright (C) 2009 Free Software Foundation, Inc."; |
| 8 | >>>>>>> 1.7 | ||