diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2014-04-02 17:14:50 +0200 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2014-04-02 17:14:50 +0200 |
commit | 09aba8153a8297e415477dbfa9a8c7e999fb3457 (patch) | |
tree | 1b15e57f5cb0d6fb4cec8e2ca03747d9e7abf163 /lisp/dired.el | |
parent | af1a69f4d17a482c359d98c00ef86fac835b5fac (diff) | |
parent | ffcd5669d6a71dd9450a9c45b2ea67d3ddc7c988 (diff) | |
download | emacs-09aba8153a8297e415477dbfa9a8c7e999fb3457.tar.gz |
Merge from emacs-24; up to 2014-03-28T01:39:30Z!rgm@gnu.org
Diffstat (limited to 'lisp/dired.el')
-rw-r--r-- | lisp/dired.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/dired.el b/lisp/dired.el index d234d724c67..5cff7891567 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3867,7 +3867,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "dired-aux" "dired-aux.el" "edcfeacd242f6163e847594870855b9e") +;;;### (autoloads nil "dired-aux" "dired-aux.el" "6969bb4414a8a31b91342ab922a94efb") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ |