summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2012-11-20 10:29:47 +0100
committerMichael Albinus <michael.albinus@gmx.de>2012-11-20 10:29:47 +0100
commit555ccdc2150fa00050ac04d55be15f768f90136c (patch)
tree6f7cce0ebba3254b2981c7a71e8c78874e75cb9a /doc
parent1faaca8ac8e43c1f9fc2ae80771308b2eb20228f (diff)
downloademacs-555ccdc2150fa00050ac04d55be15f768f90136c.tar.gz
* trampver.el:
* trampver.texi: Downgrade version to 2.2.6-24.3, in order to distinguish from trunk. Don't merge with trunk, please.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/trampver.texi2
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 4a3c8778e88..d82d9699829 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20 Michael Albinus <michael.albinus@gmx.de>
+
+ * trampver.texi: Downgrade version to 2.2.6-24.3, in order to
+ distinguish from trunk.
+
2012-11-16 Glenn Morris <rgm@gnu.org>
* cl.texi (Function Bindings): Clarify that cl-flet is lexical.
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 96043a07300..b44f1df2a1e 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
@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.6-24.3
@c Other flags from configuration
@set instprefix /usr/local