Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 75-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

2007-07-29  Kimit Yada  <kimitto@gmail.com>  (tiny change)

   * lisp/emacs-lisp/copyright.el (copyright-update-year, copyright-update)
   (copyright-fix-years, copyright): Correctly handle the case where
   copyright-limit is nil.

2007-07-28  Konstantin Novitsky  <knovitsk@Bear.com>  (tiny change)

   * lisp/progmodes/python.el (run-python): Fix path separator under w32.

2007-07-24  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-msg.el (gnus-summary-supersede-article)
   (gnus-summary-resend-message-edit): Add Gcc header.
   (gnus-summary-resend-bounced-mail): Ditto; search whole body for parent
   article's Message-ID; refer parent article in summary buffer.

   * lisp/gnus/message.el (message-bounce): Call mime-to-mml.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-838

1 files changed, 5 insertions, 1 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index fbfa0aac236..703b3d3441f 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -16,10 +16,14 @@
 
 2007-07-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
-        * vc2-xtra.texi (Customizing VC): Add GIT.
+        * vc2-xtra.texi (Customizing VC): Add GIT and HG.
 
         * dired.texi (Wdired): Mention C-x C-q key binding.
 
+2007-07-28  Nick Roberts  <nickrob@snap.net.nz>
+
+        * building.texi (GDB Graphical Interface): Qualify use of "M-x gdba".
+
 2007-07-25  Glenn Morris  <rgm@gnu.org>
 
         * calc.texi (Copying)