X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/10501882f7c23525c14f3f4712ce34f7fe335864..6ffb560b2a940d19419ac5afe11418588ef8c61f:/msdos/ChangeLog

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 6fa40a1459..4b489cdf52 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+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.
@@ -1546,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.