Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotavora@gmail.com

[gnu-emacs] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 38e5512043d7d59183e238be0959c6131199bfc4..8a8dcb14abd76e20dda8b04b2e8eb432a351bda2 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,8 +1,8 @@
-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)