+2012-05-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ Assume C89 or later.
+ * CPP-DEFINES: Remove NULL, const.
+
+ Make merging from gnulib a script, not a makefile action.
+ * merge-gnulib: New script, with actions moved here from
+ ../Makefile.in.
+
+2012-05-19 Paul Eggert <eggert@cs.ucla.edu>
+
+ * CPP-DEFINES (HAVE_GETDOMAINNAME): Remove.
+
+ * CPP-DEFINES (HAVE_FTIME): Remove.
+
2012-05-02 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".