From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 13 Nov 2015 16:41:55 +0000 (+0100)
Subject: Adapt Tramp version, do not merge with master
X-Git-Tag: emacs-25.0.90~806^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=26e7624b234f350a1f483d6fe0be8c30cca03008;p=emacs.git

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".
---

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index dccf3175386..a3032190909 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 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