summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2015-11-13 22:03:12 +0200
committerEli Zaretskii <eliz@gnu.org>2015-11-13 22:03:12 +0200
commit84c7b3879c7a720693064bc5057fcb8f218235ad (patch)
tree6ebca8a9b947b9bd61b1ed08bfbd2a3b702c609a /lisp/net
parentda05685d0b5d0d39aa774e7b236bf4d1ed4c64f5 (diff)
parent26e7624b234f350a1f483d6fe0be8c30cca03008 (diff)
downloademacs-84c7b3879c7a720693064bc5057fcb8f218235ad.tar.gz
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
Diffstat (limited to 'lisp/net')
-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 5c42f3a828a..04046c5ee7d 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -31,7 +31,7 @@
;; should be changed only there.
;;;###tramp-autoload
-(defconst tramp-version "2.2.13-pre"
+(defconst tramp-version "2.2.13-25.1"
"This version of Tramp.")
;;;###tramp-autoload