Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

1 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index eecdad64785..68a734135ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2015-01-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Port autogen.sh hook creation to private templates
+        * autogen.sh: Do not assume that the hook samples exist.
+        This ports to developers who override templatedir in their Git
+        configuration.  The downside is that patch applications won't be
+        checked, but that's better than autogen.sh failing.
+        Problem reported by Sam Steingold in:
+        http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00898.html
+
+2015-01-26  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * INSTALL.REPO: Mention minimum Git version.
+
 2015-01-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use gnustep-config if available