summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-03-31 21:31:54 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-03-31 21:31:54 +1000
commit1f04ca240d8c3d988a6bdf21961343ee22f2a289 (patch)
treeb7edb3f24c1942cb22c2abf8f5581aeb48362c29
parent5ede2ad8a74a66059a2bf02ae7b4867140b67874 (diff)
- markus@cvs.openbsd.org 2005/03/16 21:17:39
[version.h] 4.1
-rw-r--r--ChangeLog5
-rw-r--r--version.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 253fb164e..716d92227 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 based on a diff from markus; 6 based on a diff from markus;
7 problem report from ponraj; 7 problem report from ponraj;
8 ok dtucker@ markus@ deraadt@ 8 ok dtucker@ markus@ deraadt@
9 - markus@cvs.openbsd.org 2005/03/16 21:17:39
10 [version.h]
11 4.1
9 12
1020050329 1320050329
11 - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're 14 - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're
@@ -2396,4 +2399,4 @@
2396 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2399 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2397 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2400 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2398 2401
2399$Id: ChangeLog,v 1.3729 2005/03/31 11:31:10 dtucker Exp $ 2402$Id: ChangeLog,v 1.3730 2005/03/31 11:31:54 dtucker Exp $
diff --git a/version.h b/version.h
index 1a7f23bba..f6625230e 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.43 2005/03/08 23:49:48 djm Exp $ */ 1/* $OpenBSD: version.h,v 1.44 2005/03/16 21:17:39 markus Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_4.0" 3#define SSH_VERSION "OpenSSH_4.1"
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