Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu

[bpt/emacs.git] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 97d4270..9e7773a 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,13 +1,13 @@
-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)