Merge from trunk

1 files changed, 22 insertions, 4 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 49d49fb2487..e0b3a965402 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * sed1v2.inp (PROFILING_LDFLAGS):
+        * sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore.
+
+2010-10-09  Glenn Morris  <rgm@gnu.org>
+
+        * mainmake.v2 (install): Remove b2m.
+
+2010-10-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * mainmake.v2 (TAGS tags): Use `find' to filter out loaddefs
+        files.  Make all file names in TAGS tables absolute.
+
+2010-10-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * sed1v2.inp (LIBGNUTLS_LIBS, LIBGNUTLS_CFLAGS): Edit to empty.
+
 2010-09-22  Eli Zaretskii  <eliz@gnu.org>
 
         * sed1v2.inp (LINKER): Don't edit, variable was removed from
@@ -78,10 +96,10 @@
         instead of lisp/version.el (see 2010-05-15T21:11:37Z!raeburn@raeburn.org).
 
         * sed1v2.inp (MKDEPDIR): Edit to empty.
-        Delete lines in rules that invoke $(MKDEPDIR).
-        Fix editing rules that begin with "cd ../lisp".
-        Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}.
-        Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule.
+        Delete lines in rules that invoke $(MKDEPDIR).  Fix editing rules
+        that begin with "cd ../lisp".  Edit out sh if-then-else-fi
+        constructs that test ${CANNOT_DUMP}.  Edit out "|| exit ;\"
+        constructs in emacs${EXEEXT} rule.
 
 2010-06-03  Dan Nicolaescu  <dann@ics.uci.edu>