Merge from emacs-24; up to 2014-03-23T23:14:52Z!yamaoka@jpl.org

[gnu-emacs] / doc / misc / trampver.texi

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 96043a07300b20971ed4a189c5c2932ec789bfa3..3b66239f284c4fd10d8139ac0351395956b523dd 100644 (file)
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -2,13 +2,13 @@
 @c texi/trampver.texi.  Generated from trampver.texi.in by configure.
 
 @c This is part of the Emacs manual.
-@c Copyright (C) 2003-2012 Free Software Foundation, Inc.
+@c Copyright (C) 2003-2014 Free Software Foundation, Inc.
 @c See file doclicense.texi for copying conditions.
 
 @c In the Tramp CVS, 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.7-pre
+@set trampver 2.2.9-24.4
 
 @c Other flags from configuration
 @set instprefix /usr/local