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 0fec02c7b..c74a826f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - jmc@cvs.openbsd.org 2007/03/01 16:19:33 3 - jmc@cvs.openbsd.org 2007/03/01 16:19:33
4 [sshd_config.5] 4 [sshd_config.5]
5 sort the `match' keywords; 5 sort the `match' keywords;
6 - djm@cvs.openbsd.org 2007/03/06 10:13:14
7 [version.h]
8 openssh-4.6; "please" deraadt@
6 9
720070304 1020070304
8 - (djm) [configure.ac] add a --without-openssl-header-check option to 11 - (djm) [configure.ac] add a --without-openssl-header-check option to
@@ -2809,4 +2812,4 @@
2809 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2812 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2810 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2813 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2811 2814
2812$Id: ChangeLog,v 1.4632 2007/03/06 10:21:18 djm Exp $ 2815$Id: ChangeLog,v 1.4633 2007/03/06 10:21:37 djm Exp $
diff --git a/version.h b/version.h
index d16990a21..0f4811120 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.48 2006/11/07 10:31:31 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.49 2007/03/06 10:13:14 djm Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_4.5" 3#define SSH_VERSION "OpenSSH_4.6"
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