Merge changes from emacs-23 branch.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b859353b0835bfe3f91fcc34dbdffb2dfb618325..eb12c7d97c2eb9e0d7eef24ed67931d34cc05a26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-12  Eli Zaretskii  <eliz@gnu.org>
+
+       * make-dist: Don't distribute src/buildobj.h.  (Bug#7167)
+
 2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * configure.in (PROFILING_LDFLAGS): Do not define, remove all uses.