Merge from emacs-24

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 56e7520d421744bd0ccddf056486fbd0783297ab..166e0e96110ad1335d5865a277161bde1406c00e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * .gitignore: Remove redundant pattern (subsumed by _*).
+       Avoid "**", as it requires Git 1.8.2 or later.
+
+2014-12-05  Paul Eggert  <eggert@cs.ucla.edu>
 2014-12-05  Eli Zaretskii  <eliz@gnu.org>
 
        * .gitignore: Ignore test/biditest.txt.