Merge from mainline.

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e4ab9a1e466bd07f3baf7f9079610ef2a96744b6..7ff13a707187c39d00de28a44c54dff655738d71 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-04  Xue Fuqiao  <xfq.free@gmail.com>
+
+       * maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument.
+
 2013-08-31  Ulrich Müller  <ulm@gentoo.org>
 
        * xresources.texi (Motif Resources):