aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2014-11-09 23:39:35 -0800
committerGlenn Morris2014-11-09 23:39:35 -0800
commitc832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe (patch)
tree98a77f1acdac589d1be95dea128af1af7e8dc286 /lisp/ChangeLog
parenteca1ea96559e04e18a62a61208d501c557dd4cab (diff)
parentedfdb22f674312389ccf5d5e37efa4d3f1516994 (diff)
downloademacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.tar.gz
emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.zip
Merge from emacs-24; up to 117698
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 94473f03b7f..c170c50c9f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-11-10 Glenn Morris <rgm@gnu.org>
2
3 * startup.el (command-line): Handle nil elements in load-path.
4
12014-11-10 Stefan Monnier <monnier@iro.umontreal.ca> 52014-11-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * help.el (view-lossage): Include the actual commands run. 7 * help.el (view-lossage): Include the actual commands run.