Merge from origin/emacs-24

[gnu-emacs] / msdos / ChangeLog

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 6fa40a145957adda1b741108d83371bdb9def5d9..4b489cdf521e36a09fe181ace08bbd628490aabe 100644 (file)
--- 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.