X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/1e0b702b8f1efd441a0d7fac764bf07e3d17df2e..6ffb560b2a940d19419ac5afe11418588ef8c61f:/msdos/ChangeLog?ds=sidebyside

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 9a84c907cf..4b489cdf52 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,14 +1,33 @@
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+	* Merge in all changes up to 24.4 release.
+
+2014-09-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* sed2v2.inp: Bump version to 25.0.50.
+
+2014-08-28  Eli Zaretskii  <eliz@gnu.org>
+
+	* sedlibmk.inp (gl_LIBOBJS): Add execinfo.o.  Reported by Juan
+	Manuel Guerrero <juan.guerrero@gmx.de>.
+
+	* sed2v2.inp [DJGPP <= 2.03]: Add a prototype for snprintf, to
+	avoid compilation warning from newer GCC versions that have
+	snprintf as a built-in.  Reported by Juan Manuel Guerrero
+	<juan.guerrero@gmx.de>.
+
 2014-08-09  Eli Zaretskii  <eliz@gnu.org>
 
 	* INSTALL: Fix last change.
 
 2014-08-09  Reuben Thomas  <rrt@sc3d.org>
 
+	* is_exec.c, sigaction.c: Remove files.
 	* sed2v2.inp: Remove support for DJGPP 2.01.
 	* INSTALL: Don't mention removed files msdos/is_exec.c and
 	sigaction.c, and increase minimum version of DJGPP to 2.02.
 	* README: Remove note on legal status of removed files
-	msdos/is_exec.c and sigaction.c.
+	is_exec.c and sigaction.c.
 
 2014-04-16  Eli Zaretskii  <eliz@gnu.org>
 
@@ -1531,7 +1550,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1994-1999, 2001-2014 Free Software Foundation, Inc.
+  Copyright (C) 1994-1999, 2001-2015 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.