summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2015-11-13 17:41:55 +0100
committerMichael Albinus <michael.albinus@gmx.de>2015-11-13 17:41:55 +0100
commit26e7624b234f350a1f483d6fe0be8c30cca03008 (patch)
tree3308a657522941807dd9b60956a39276e2dac5fa
parent9463abf4cc7571cf125bf1a637abe1a34241e83d (diff)
Adapt Tramp version, do not merge with master
* doc/misc/trampver.texi (trampver): * lisp/net/trampver.el (tramp-version): Set to "2.2.13-25.1".
-rw-r--r--doc/misc/trampver.texi2
-rw-r--r--lisp/net/trampver.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index dccf317538..a303219090 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
@c In the Tramp GIT, the version number is auto-frobbed from
@c configure.ac, so you should edit that file and run
@c "autoconf && ./configure" to change the version number.
-@set trampver 2.2.13-pre
+@set trampver 2.2.13-25.1
@c Other flags from configuration
@set instprefix /usr/local
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 5c42f3a828..04046c5ee7 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