Merge branch 'emacs-24'

[gnu-emacs] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index cc69367555fc58856da558ad327e567ddb2bf74c..6d134046a381f45b910dc5120f5c65b9c9b2059b 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
+
+       * admin/CPP-DEFINES: Mention MINGW_W64.
+
 2014-11-22  Glenn Morris  <rgm@gnu.org>
 
        * admin.el (set-version): No more need to update nt/*.rc.