merge trunk

2 files changed, 12 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index ee1915245a0..a2770c12305 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-24  Christoph Scholtes  <cschol2112@gmail.com>
+
+        * NEWS: Document new --distfiles configure.bat option and
+        `dist' make target on Windows.
+
 2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
 
         * PROBLEMS: Add note about use of backslashes in Windows paths.
@@ -4941,7 +4946,7 @@
         * etags.c: Changes for VMS.
         Always define ETAGS on VMS.
         Define macros GOOD and BAD for success and failure exit codes.
-        (begtk, intk): Allow `$' in identifiers
+        (begtk, intk): Allow `$' in identifiers.
         (main): Don't support -B, -F or -u on VMS.
         Alternate loop for scanning filename arguments.
         (system): Delete definition of this function.
diff --git a/etc/NEWS b/etc/NEWS
index 31dd69d5b4c..6b781ab8364 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -432,6 +432,12 @@ displayed with a "spinning bar".
 ** New configure.bat option --enable-checking builds emacs with extra
 runtime checks.
 
+** New configure.bat option --distfiles to specify files to be
+   included in binary distribution
+
+** New make target `dist' to create binary disttribution for Windows
+   platform
+
 
 ----------------------------------------------------------------------
 This file is part of GNU Emacs.