# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1288990370 -3600
# Node ID 45e5b5974ddbc82db0253a6a813469a8398b789d
# Parent  0792cbcb42eddfaaa7d8d614588ba4a64b4d1613
* net/trampver.el: Update release number.

This shall not be merged into the trunk.

diff -r 0792cbcb42ed -r 45e5b5974ddb lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 05 14:28:19 2010 -0400
+++ b/lisp/ChangeLog	Fri Nov 05 21:52:50 2010 +0100
@@ -1,3 +1,7 @@
+2010-11-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/trampver.el: Update release number.
+
 2010-08-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* mouse.el (mouse-fixup-help-message): Match "mouse-2" only at the
diff -r 0792cbcb42ed -r 45e5b5974ddb lisp/net/trampver.el
--- a/lisp/net/trampver.el	Fri Nov 05 14:28:19 2010 -0400
+++ b/lisp/net/trampver.el	Fri Nov 05 21:52:50 2010 +0100
@@ -30,14 +30,14 @@
 ;; version check is defined in macro AC_EMACS_INFO of aclocal.m4;
 ;; should be changed only there.
 
-(defconst tramp-version "2.1.20-pre"
+(defconst tramp-version "2.1.20"
   "This version of Tramp.")
 
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
   "Email address to send bug reports to.")
 
 ;; Check for (X)Emacs version.
-(let ((x (if (or (>= emacs-major-version 22)	(and (featurep 'xemacs)	     (= emacs-major-version 21)	     (>= emacs-minor-version 4)))    "ok"    (format "Tramp 2.1.20-pre is not fit for %s"	    (when (string-match "^.*$" (emacs-version))	      (match-string 0 (emacs-version)))))))
+(let ((x (if (or (>= emacs-major-version 22)	(and (featurep 'xemacs)	     (= emacs-major-version 21)	     (>= emacs-minor-version 4)))    "ok"    (format "Tramp 2.1.20 is not fit for %s"	    (when (string-match "^.*$" (emacs-version))	      (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
 
 (provide 'trampver)