aboutsummaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
authorKaroly Lorentey2007-04-22 11:42:03 +0000
committerKaroly Lorentey2007-04-22 11:42:03 +0000
commit81088e260b086fe28f36964f32b6338210ec6fd8 (patch)
tree53d5af73ca0c971fe6925944d4d059caab5337a2 /mac
parentfa1b1007cac59bafd16df7bd501ef2591dd77d62 (diff)
parenta6f0e674ebf44b1d37732b64070b804673481d28 (diff)
downloademacs-81088e260b086fe28f36964f32b6338210ec6fd8.tar.gz
emacs-81088e260b086fe28f36964f32b6338210ec6fd8.zip
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-650 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-651 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-652 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-653 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-654 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-655 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-656 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-657 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-658 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-659 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-203 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-204 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-205 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-599
Diffstat (limited to 'mac')
-rw-r--r--mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings4
-rw-r--r--mac/src/Emacs.r6
2 files changed, 5 insertions, 5 deletions
diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index fd6d57b84b5..6415a2ded77 100644
--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Emacs"; 3CFBundleName = "Emacs";
4CFBundleShortVersionString = "22.0.94"; 4CFBundleShortVersionString = "22.0.95";
5CFBundleGetInfoString = "22.0.94, Copyright (C) 2007 Free Software Foundation, Inc."; 5CFBundleGetInfoString = "22.0.95, Copyright (C) 2007 Free Software Foundation, Inc.";
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index abda6f631c7..b09e216e442 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -221,10 +221,10 @@ resource 'vers' (1) {
221 0x22, /* Major revision in BCD */ 221 0x22, /* Major revision in BCD */
222 0x0, /* Minor revision in BCD */ 222 0x0, /* Minor revision in BCD */
223 alpha, /* development, alpha, beta, or final (release) */ 223 alpha, /* development, alpha, beta, or final (release) */
224 94, /* Non-final release # */ 224 95, /* Non-final release # */
225 0, /* Region code */ 225 0, /* Region code */
226 "22.0.94", /* Short version number */ 226 "22.0.95", /* Short version number */
227 "22.0.94, Copyright \0xa9 2007 " 227 "22.0.95, Copyright \0xa9 2007 "
228 "Free Software Foundation, Inc." /* Long version number */ 228 "Free Software Foundation, Inc." /* Long version number */
229}; 229};
230 230