aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2014-11-04 21:08:57 -0800
committerGlenn Morris2014-11-04 21:08:57 -0800
commitb6e66a5cc78e353ff9ae6cdd0807eefcf55b4934 (patch)
treec7562d5cde06977fc2eb14a7c0b6972738696386 /ChangeLog
parentddce73d32fa3e62e022842e3bbdc0aa83bb358cc (diff)
parent58064b4da2835acb24d0f68021c84102e0fb1c0f (diff)
downloademacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.tar.gz
emacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.zip
Merge from emacs-24; up to 117669
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6fa196a627e..ee84be5a83d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2338,7 +2338,7 @@
23382012-12-13 Andreas Schwab <schwab@suse.de> 23382012-12-13 Andreas Schwab <schwab@suse.de>
2339 2339
2340 * Makefile.in (install-info): Use `${MAKE} -s' for echo-info. 2340 * Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
2341 (uninstall): Likewise. (Bug#13143) 2341 (uninstall): Likewise. (Bug#13142)
2342 2342
23432012-12-11 Paul Eggert <eggert@cs.ucla.edu> 23432012-12-11 Paul Eggert <eggert@cs.ucla.edu>
2344 2344