Merge from emacs-24; up to 2013-01-01T11:02:14Z!rudalics@gmx.at

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85c68323cfe8673f266e1846ec5b7b3ffcbd974c..358a23450a8d38e558503a872d21d453e99a607d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-25  Glenn Morris  <rgm@gnu.org>
+
+       * dired-x.el (dired-mark-extension): Convert comment to doc string.
+
 2013-07-25  Juanma Barranquero  <lekktu@gmail.com>
 
        * desktop.el (desktop--make-frame): Do not pass the `fullscreen'