Merge from emacs--rel--22

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 925ac49dedc440bb43b367c0ba0c1575255ce25e..6d662c67683b55ab06ec443487686340d870e5dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-16  Chong Yidong  <cyd@stupidchicken.com>
+
+       * make-dist: Omit info/.arch-inventory.
+
+2008-08-16  Jason Rumney  <jasonr@gnu.org>
+
+       * make-dist (tempdir/nt): Link emacsclient.rc.
+
 2008-08-07  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * configure.in (LIB_SRC_EXTRA_INSTALLABLES): New variable.