aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorJuanma Barranquero2014-04-30 21:54:52 +0200
committerJuanma Barranquero2014-04-30 21:54:52 +0200
commit09b911adf4e22bbcac8c588bc14ade801276732e (patch)
tree0d9eb9708479bb491d7e1e2bb030aa3e90299526 /ChangeLog
parentb0e36b7048c88aa24f6955c53fbe790bb9ebc54f (diff)
parent426b5dafdd837328d624a8ec5bfd567f2865c9f5 (diff)
downloademacs-09b911adf4e22bbcac8c588bc14ade801276732e.tar.gz
emacs-09b911adf4e22bbcac8c588bc14ade801276732e.zip
Merge from emacs-24; up to 2014-05-01T10:21:17Z!rgm@gnu.org
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e8f586bbca5..3927dcc2e47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12014-04-30 Glenn Morris <rgm@gnu.org>
2
3 * configure.ac: Treat MirBSD as OpenBSD. (Bug#17339)
4
12014-04-21 Daniel Colascione <dancol@dancol.org> 52014-04-21 Daniel Colascione <dancol@dancol.org>
2 6
3 * .bzrignore: Add a.out to bzr ignore list (a test generates this 7 * .bzrignore: Add a.out to bzr ignore list (a test generates this