summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 24c3a23bd..a380ba6f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
5 - jmc@cvs.openbsd.org 2005/03/07 23:41:54 5 - jmc@cvs.openbsd.org 2005/03/07 23:41:54
6 [ssh.1 ssh_config.5] 6 [ssh.1 ssh_config.5]
7 more macro simplification; 7 more macro simplification;
8 - djm@cvs.openbsd.org 2005/03/08 23:49:48
9 [version.h]
10 OpenSSH 4.0
8 11
920050307 1220050307
10 - (dtucker) [configure.ac] Disable gettext search when configuring with 13 - (dtucker) [configure.ac] Disable gettext search when configuring with
@@ -2314,4 +2317,4 @@
2314 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2317 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2315 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2318 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2316 2319
2317$Id: ChangeLog,v 1.3704 2005/03/09 00:00:05 djm Exp $ 2320$Id: ChangeLog,v 1.3705 2005/03/09 00:00:42 djm Exp $
diff --git a/version.h b/version.h
index d0c867b87..1a7f23bba 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.42 2004/08/16 08:17:01 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.43 2005/03/08 23:49:48 djm Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_3.9" 3#define SSH_VERSION "OpenSSH_4.0"
4 4
5#define SSH_PORTABLE "p1" 5#define SSH_PORTABLE "p1"
6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE 6#define SSH_RELEASE SSH_VERSION SSH_PORTABLE