Fix merge

[libffi.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 19beda8..138b5af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-10  Mike Hommey <mh+mozilla@glandium.org>
+
+       * configure.ac: Allow building for mipsel with Android NDK r8.
+       * Makefile.am (AM_MAKEFLAGS): Replace double quotes with single quotes.
+
+2014-03-01  Anthony Green  <green@moxielogic.com>
+
+       * Makefile.am (EXTRA_DIST): Replace old scripts with
+       generate-darwin-source-and-headers.py.
+       * Makefile.in: Rebuilt.
+
 2014-02-28  Anthony Green  <green@moxielogic.com>
 
        * Makefile.am (AM_CFLAGS): Reintroduce missing -DFFI_DEBUG for