Merged from miles@gnu.org--gnu-2005 (patch 470-473)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-470
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-471
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-472
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-473
   Update from CVS

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

1 files changed, 6 insertions, 2 deletions

diff --git a/mac/ChangeLog b/mac/ChangeLog
index 38a1a8fe2e3..a53b3cd89d4 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-04  Lute Kamstra  <lute@gnu.org>
+
+        Update FSF's address in GPL notices.
+
 2005-06-08  Steven Tamm  <steventamm@mac.com>
 
         * INSTALL: Explain that a universal binary cannot be created and
@@ -109,13 +113,13 @@
         * inc/m-mac.h (HAVE_ALLOCA) [__MRC__]: Define.
         (C_ALLOCA) [__MRC__]: Don't define.
         * inc/s-mac.h (X_OK): New define.
-        (DECL_ALIGN) [USE_LSB_TAG && __MRC__]: New macro. 
+        (DECL_ALIGN) [USE_LSB_TAG && __MRC__]: New macro.
         (GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS.
 
 2004-05-29  Steven Tamm  <steventamm@mac.com>
 
         * INSTALL: Fixing typos
-        * README: Updating list of TODOs to remove image support and 
+        * README: Updating list of TODOs to remove image support and
         environment variable problem.
 
 2004-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>