Merge from emacs-24; up to 2014-05-01T10:21:17Z!rgm@gnu.org

[gnu-emacs] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 299879ccba87bd77702101d290824d6d171985a3..f31d2619319a667cfbb7fd67cec5e00379a683de 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,18 +1,18 @@
-2014-04-26  Eli Zaretskii  <eliz@gnu.org>
+2014-04-30  Eli Zaretskii  <eliz@gnu.org>
 
        * cmdproxy.c (make_absolute): Don't copy more characters from PATH
        than a single directory name can hold.  (Bug#17334)
 
-2014-04-21  Eli Zaretskii  <eliz@gnu.org>
+2014-04-22  Eli Zaretskii  <eliz@gnu.org>
 
        * inc/ms-w32.h (lseek): Define only if not already a macro.
        Suggested by Fabrice Popineau <fabrice.popineau@gmail.com>.
 
-2014-04-09  Ken Brown  <kbrown@cornell.edu>
+2014-04-11  Ken Brown  <kbrown@cornell.edu>
 
        * emacs.rc: Revert last change.
 
-2014-04-03  Ken Brown  <kbrown@cornell.edu>
+2014-04-07  Ken Brown  <kbrown@cornell.edu>
 
        * emacs.rc: Don't use manifest on Cygwin.  (Bug#17176)