aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/url/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <[email protected]>2014-05-04 12:37:56 -0700
committerPaul Eggert <[email protected]>2014-05-04 12:37:56 -0700
commit3e9fa60a5c99568817a12a1011b0e61cce5d3a67 (patch)
tree831a801351db662f324d0709bf1fee718eda63e9 /lisp/url/ChangeLog
parentbbdcf64f499636ba9567e8fed8f209e06380352c (diff)
parent61febcb6e32860575316b8a539a2e9f13f70e3c2 (diff)
Merge from emacs-24; up to 2014-05-04T21:18:[email protected]
Diffstat (limited to 'lisp/url/ChangeLog')
-rw-r--r--lisp/url/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 486c6649c0..f342665603 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-04 Glenn Morris <[email protected]>
+
+ * url-parse.el (url-generic-parse-url): Doc fix (replace `iff').
+
2014-04-01 Michael Albinus <[email protected]>
* url-tramp.el: New file.