Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 476-489)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 153-160)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127

1 files changed, 4 insertions, 4 deletions

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 */
 };