Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25

This commit is contained in:
Eli Zaretskii 2015-11-13 22:03:12 +02:00
commit 84c7b3879c
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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