1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

Merge from emacs-24; up to 2014-03-28T01:39:30Z!rgm@gnu.org

This commit is contained in:
Juanma Barranquero 2014-04-02 17:14:50 +02:00
commit 09aba8153a
22 changed files with 172 additions and 140 deletions

View file

@ -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" "\