aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2010-03-14 21:10:47 +0100
committerMichael Albinus2010-03-14 21:10:47 +0100
commitc8215db1b9411470ccc91d53a0aba17665b7cfbc (patch)
tree4483562f1897bc2cbeab9e7570e068cccff0de6f
parent9496bea877ecb07efa923a3f95c2106f19d25691 (diff)
downloademacs-c8215db1b9411470ccc91d53a0aba17665b7cfbc.tar.gz
emacs-c8215db1b9411470ccc91d53a0aba17665b7cfbc.zip
* lisp/net/trampver.el: Update release number.
* doc/misc/trampver.texi: Update release number.
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/trampver.texi2
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/trampver.el2
4 files changed, 10 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 3e491c42de9..1cf6cc8f6ff 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12010-03-14 Michael Albinus <michael.albinus@gmx.de>
2
3 * trampver.texi: Update release number.
4
12010-03-03 Chong Yidong <cyd@stupidchicken.com> 52010-03-03 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * faq.texi (Escape sequences in shell output): Note that ansi-color is 7 * faq.texi (Escape sequences in shell output): Note that ansi-color is
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 8456a1e0d11..c8608edf6b6 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -9,7 +9,7 @@
9@c In the Tramp CVS, the version number is auto-frobbed from 9@c In the Tramp CVS, the version number is auto-frobbed from
10@c configure.ac, so you should edit that file and run 10@c configure.ac, so you should edit that file and run
11@c "autoconf && ./configure" to change the version number. 11@c "autoconf && ./configure" to change the version number.
12@set trampver 2.1.18-pre 12@set trampver 2.1.18-23.2
13 13
14@c Other flags from configuration 14@c Other flags from configuration
15@set instprefix /usr/local 15@set instprefix /usr/local
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9142650765d..314af821736 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-03-14 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/trampver.el: Update release number.
4
12010-03-13 Glenn Morris <rgm@gnu.org> 52010-03-13 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in (ELCFILES): Add cedet/semantic/imenu.el. 7 * Makefile.in (ELCFILES): Add cedet/semantic/imenu.el.
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 9444787fc27..c5387a26722 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -29,7 +29,7 @@
29;; "autoconf && ./configure" to change them. (X)Emacs version check is defined 29;; "autoconf && ./configure" to change them. (X)Emacs version check is defined
30;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there. 30;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there.
31 31
32(defconst tramp-version "2.1.18-pre" 32(defconst tramp-version "2.1.18-23.2"
33 "This version of Tramp.") 33 "This version of Tramp.")
34 34
35(defconst tramp-bug-report-address "tramp-devel@gnu.org" 35(defconst tramp-bug-report-address "tramp-devel@gnu.org"