[Emacs-diffs] emacs-25 84c7b38 14/14: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25

[Eli Zaretskii]

branch: emacs-25
commit 84c7b3879c7a720693064bc5057fcb8f218235ad
Merge: da05685 26e7624
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
---
 doc/misc/trampver.texi |    2 +-
 lisp/net/trampver.el   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index dccf317..a303219 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.
address@hidden trampver 2.2.13-pre
address@hidden 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 5c42f3a..04046c5 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