aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2014-10-05 10:19:23 -0700
committerGlenn Morris2014-10-05 10:19:23 -0700
commit249635f0dfb22bcae4c7134e95f01640a6a0d149 (patch)
tree35ee0c4874f81c26a0d2d8ed17eb451f2b3d964b /lisp/ChangeLog
parent6e604a82a0f8dad3a55c54cf8b64ef2d38106f5b (diff)
parentc938c07bf3505a6d418678a04ff24f25d9039160 (diff)
downloademacs-249635f0dfb22bcae4c7134e95f01640a6a0d149.tar.gz
emacs-249635f0dfb22bcae4c7134e95f01640a6a0d149.zip
Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a88ac6b37a..039387ed4af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-10-05 Leo Liu <sdl.web@gmail.com>
2
3 * imenu.el (imenu-default-goto-function): Fix typo.
4
12014-10-04 Thomas Fitzsimmons <fitzsim@fitzsim.org> 52014-10-04 Thomas Fitzsimmons <fitzsim@fitzsim.org>
2 6
3 * net/ntlm.el (ntlm-build-auth-request): 7 * net/ntlm.el (ntlm-build-auth-request):