summaryrefslogtreecommitdiff
path: root/lisp/Makefile.in
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2010-09-30 01:28:20 +0200
committerStefan Monnier <monnier@iro.umontreal.ca>2010-09-30 01:28:20 +0200
commita01a7932080e8a6e7bc8472c58cefabcc2c37df3 (patch)
tree94b28b19c8f1536e76ffe7d5826811b74a79e3a5 /lisp/Makefile.in
parentcc390e46c7ba95b76ea133d98fd386214cd01709 (diff)
parent6b0f7311f16646e0de2045b2410e20921901c616 (diff)
downloademacs-a01a7932080e8a6e7bc8472c58cefabcc2c37df3.tar.gz
Merge from trunk
Diffstat (limited to 'lisp/Makefile.in')
-rw-r--r--lisp/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 391375b2d18..acc073650db 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -346,9 +346,9 @@ $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
TRAMP_DIR = $(lisp)/net
TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-cache.el \
$(TRAMP_DIR)/tramp-cmds.el $(TRAMP_DIR)/tramp-compat.el \
- $(TRAMP_DIR)/tramp-fish.el $(TRAMP_DIR)/tramp-ftp.el \
- $(TRAMP_DIR)/tramp-gvfs.el $(TRAMP_DIR)/tramp-gw.el \
- $(TRAMP_DIR)/tramp-imap.el $(TRAMP_DIR)/tramp-smb.el \
+ $(TRAMP_DIR)/tramp-ftp.el $(TRAMP_DIR)/tramp-gvfs.el \
+ $(TRAMP_DIR)/tramp-gw.el $(TRAMP_DIR)/tramp-imap.el \
+ $(TRAMP_DIR)/tramp-sh.el $(TRAMP_DIR)/tramp-smb.el \
$(TRAMP_DIR)/tramp-uu.el $(TRAMP_DIR)/trampver.el
$(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)