aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorDaniel Colascione2014-04-07 13:54:16 -0700
committerDaniel Colascione2014-04-07 13:54:16 -0700
commit7e31acf6b81fdce7258077645bc239767c484841 (patch)
tree1f0d7b063a19b54982550797df063e0a9f87eaed /ChangeLog
parent608a4502b9fa8f5681368657fba5d5fd0fa46817 (diff)
parente3b838807bf9fbbbec9826de6c1e4efdf72acb78 (diff)
downloademacs-7e31acf6b81fdce7258077645bc239767c484841.tar.gz
emacs-7e31acf6b81fdce7258077645bc239767c484841.zip
Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a9321a84dd8..7d3f17f8207 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12014-04-03 Ken Brown <kbrown@cornell.edu>
2
3 * configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
4 variables empty on Cygwin. (Bug#17176)
5
12014-04-03 Glenn Morris <rgm@gnu.org> 62014-04-03 Glenn Morris <rgm@gnu.org>
2 7
3 * make-dist: Further update AC_INIT regexp. 8 * make-dist: Further update AC_INIT regexp.