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

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

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

3 files changed, 4 insertions, 4 deletions

diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 4984704f9fc..138afca2ead 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -1,6 +1,6 @@
 /* Resource definitions for GNU Emacs on the Macintosh.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -222,7 +222,7 @@ resource 'vers' (1) {
         50,             /* Non-final release # */
         0,              /* Region code */
         "22.0.50",      /* Short version number */
-        "22.0.50, Copyright \0xa9 2005 "
+        "22.0.50, Copyright \0xa9 2006 "
         "Free Software Foundation, Inc." /* Long version number */
 };
 
diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index 16866de9574..113524e6d3f 100644
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -2,7 +2,7 @@
    under MPW.
 
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index 61d0b63a78e..324fdd801b2 100644
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -1,6 +1,6 @@
 /* Implementation of chdir on the Mac for use with make-docfile.
    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005 Free Software Foundation, Inc.
+      2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.