1 files changed, 20 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 239b5efd6be..8cc6635f886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2014-11-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        .gitignore cleanup.
+        * .gitignore: Merge contents of subsidiary files and organize the
+        result so as to avoid duplication.  Remove no-longer needed entries.
+        * admin/charsets/.gitignore, admin/unidata/.gitignore:
+        * doc/lispintro/.gitignore, etc/.gitignore, leim/.gitignore:
+        * leim/ja-dic/.gitignore, lib-src/.gitignore, lisp/.gitignore:
+        * lisp/calc/.gitignore, lisp/calendar/.gitignore:
+        * lisp/cedet/.gitignore, lisp/emulation/.gitignore:
+        * lisp/erc/.gitignore, lisp/eshell/.gitignore, lisp/gnus/.gitignore:
+        * lisp/international/.gitignore, lisp/language/.gitignore:
+        * lisp/leim/.gitignore, lisp/leim/quail/.gitignore:
+        * lisp/mail/.gitignore, lisp/mh-e/.gitignore, lisp/net/.gitignore:
+        * lisp/nxml/.gitignore, lisp/obsolete/.gitignore:
+        * lisp/play/.gitignore, lisp/progmodes/.gitignore:
+        * lisp/term/.gitignore, lisp/textmodes/.gitignore:
+        * lisp/url/.gitignore, nt/.gitignore, src/.gitignore:
+        Remove; no longer needed.
+
 2014-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.