Use full name for m4/gnulib-comp.m4. (Bug#11529)

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ac2323c..5ee3112 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,32 @@
+2012-05-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Use full name for m4/gnulib-comp.m4.  (Bug#11529)
+       * merge-gnulib: Leave m4/gnulib-comp.m4's name alone.
+
+       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".
+
+2012-04-10  Glenn Morris  <rgm@gnu.org>
+
+       * bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".
+
+       * unidata/Makefile.in: Add FSF copyright.
+       Make it use autoconf features, and work for out-of-tree builds.
+
 2012-04-07  Eli Zaretskii  <eliz@gnu.org>
 
        * unidata/README:
@@ -1255,7 +1284,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.