branch: main
commit 401b5df341093eac8e0a58b4846f11a03c0ee278
Merge: b80f766 37f7e91
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
Merge remote-tracking branch 'refs/remotes/origin/main' into main
---
elpa-packages | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/elpa-packages b/elpa-packages
index 93967e1..876e727 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -295,7 +295,11 @@
("timerfunctions" :url nil)
("tiny" :url "https://github.com/abo-abo/tiny";)
("tNFA" :url "http://www.dr-qubit.org/git/predictive.git";)
- ("tramp" :url "git://git.sv.gnu.org/tramp.git" :branch "elpa")
+ ("tramp" :url "git://git.sv.gnu.org/tramp.git"
+ :branch "externals/tramp"
+ :main-file "trampver.el"
+ :make ("autoloads" "info")
+ :doc "tramp.info")
("tramp-theme" :url nil)
("transcribe" :url nil)
("transient" :url "https://github.com/magit/transient";
