Merge from origin/emacs-24

[gnu-emacs] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index b9966fb27d8cbf57f1f4798f4df949d12b2b54e2..240f58c850b07f008dd007a3ea77ad6cd8a29a9a 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-27  Mark Laws  <mdl@60hz.org>
+
+       Support daemon mode on MS-Windows (bug#19688)
+       * inc/ms-w32.h (W32_DAEMON_EVENT): New macro.
+
 2015-01-16  Eli Zaretskii  <eliz@gnu.org>
 
        * Makefile.in (AM_V_CC, am__v_CC_, am__v_CC_0, am__v_CC_1)