Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-479
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-480
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-481
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-482
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-483
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-484
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-485
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-153
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-154
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-155
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-585

2 files changed, 6 insertions, 6 deletions

diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index db6b39880e2..483095829c5 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 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Emacs";
-CFBundleShortVersionString = "22.0.50";
-CFBundleGetInfoString = "22.0.50, Copyright (C) 2006 Free Software Foundation, Inc.";
+CFBundleShortVersionString = "22.0.90";
+CFBundleGetInfoString = "22.0.90, Copyright (C) 2006 Free Software Foundation, Inc.";
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 081580d101c..30f572ee207 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -220,11 +220,11 @@ resource 'FREF' (129) {
 resource 'vers' (1) {
         0x22,           /* Major revision in BCD */
         0x0,            /* Minor revision in BCD */
-        development,    /* development, alpha, beta, or final (release) */
-        50,             /* Non-final release # */
+        alpha,  /* development, alpha, beta, or final (release) */
+        90,             /* Non-final release # */
         0,              /* Region code */
-        "22.0.50",      /* Short version number */
-        "22.0.50, Copyright \0xa9 2006 "
+        "22.0.90",      /* Short version number */
+        "22.0.90, Copyright \0xa9 2006 "
         "Free Software Foundation, Inc." /* Long version number */
 };