Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

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

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

1 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a51c969309..9e4bd3ce541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-18  Bruno Haible  <bruno@clisp.org> (tiny change)
+
+        * INSTALL: Info files moved to share/info.
+
+2007-01-02  Stephen C. Gilardi  <scgilardi@gmail.com>  (tiny change)
+
+        * configure.in: Detect and use fink-installed in intel-based Mac
+        builds; change Apple Darwin section to support both PowerPC and
+        Intel-based Macs.
+
 2006-12-26  Andreas Schwab  <schwab@suse.de>
 
         * Makefile.in (datarootdir): Define.
@@ -6364,7 +6374,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-        2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+        2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.