Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

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

2 files changed, 6 insertions, 0 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index e0a5a417528..96594144135 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * INSTALL: Add Make 3.81 to the list of Make & shell combinations
+        known to work.
+
 2006-03-12  Jason Rumney  <jasonr@gnu.org>
 
         * addpm.c (add_registry): Don't change the registry unless keys
diff --git a/nt/INSTALL b/nt/INSTALL
index f9231d4b704..dc289531472 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -127,6 +127,7 @@
     cygwin compiled make 3.79.1:         fails[3, 5]   fails[2?, 5]
     mingw32 compiled make 3.79.1:        okay          okay
     mingw32 compiled make 3.80:          okay          unknown[6]
+    mingw32 compiled make 3.81:          okay          okay[7]
 
   Notes: