summaryrefslogtreecommitdiff
path: root/lisp/net/trampver.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-11-28 07:51:12 -0800
committerGlenn Morris <rgm@gnu.org>2018-11-28 07:51:12 -0800
commit415ef4a2b02dac17bf1bb962154633e671e561dd (patch)
tree029c1022ff672e6e4e4a2d44a8661a6543b130e5 /lisp/net/trampver.el
parent2c59cfa831f133ca75b513e05aaedeccfe410784 (diff)
parent74a3a795afbf092d4086e5ebb4dcf0254e7c8b46 (diff)
downloademacs-415ef4a2b02dac17bf1bb962154633e671e561dd.tar.gz
Merge from origin/emacs-26
74a3a79 (origin/emacs-26) Fix a typo in a doc string 911766d Minor markup fix in frames.texi 19ed1e9 * lisp/net/trampver.el (customize-package-emacs-version-alist... d7132ad * lisp/mh-e/mh-e.el (customize-package-emacs-version-alist): ... 5f39260 * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Pass format to m... a291f62 Don't call xwidget functions until GTK has been initialized f0531b8 Improve documentation of Ediff wordwise commands 2925ce5 Support Hunspell 1.7.0 in ispell.el 03bb7a8 Avoid clearing echo-area message by auto-save-visited-file-name
Diffstat (limited to 'lisp/net/trampver.el')
-rw-r--r--lisp/net/trampver.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index d9b152e2bf6..ebd581b5f5a 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -78,7 +78,7 @@
("2.2.3-24.1" . "24.1") ("2.2.3-24.1" . "24.2") ("2.2.6-24.3" . "24.3")
("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5")
("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2")
- ("2.2.13.25.2" . "25.3")
+ ("2.2.13.25.2" . "25.3") ("2.3.3" . "26.1")
("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")))
(add-hook 'tramp-unload-hook