Merge from origin/emacs-24

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index ad3630c4a9996784204e8b956da5330f8d1d977a..f04b60ef537455eb7c0af7d4ed5c7101d9e56b94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * .gitattributes: New file.
+
+2015-01-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * autogen.sh: Port better to non-GNU 'cp'.
+       Problem reported by Han Boetes.
+
 2014-12-31  Paul Eggert  <eggert@cs.ucla.edu>
 
        Less 'make' chatter at top level