summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-03-06 21:21:37 +1100
committerDamien Miller <djm@mindrot.org>2007-03-06 21:21:37 +1100
commit2dbab87386ba6816466475fc5308a79199543ebb (patch)
tree1751ff2860907cabe0aea94bb5ea7b17b847899a
parent5737e363c5b8d74ba8caddbcc2458a2c858cf72f (diff)
- djm@cvs.openbsd.org 2007/03/06 10:13:14
[version.h] openssh-4.6; "please" deraadt@
-rw-r--r--ChangeLog5
-rw-r--r--version.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fec02c7..c74a826f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
- jmc@cvs.openbsd.org 2007/03/01 16:19:33
[sshd_config.5]
sort the `match' keywords;
+ - djm@cvs.openbsd.org 2007/03/06 10:13:14
+ [version.h]
+ openssh-4.6; "please" deraadt@
20070304
- (djm) [configure.ac] add a --without-openssl-header-check option to
@@ -2809,4 +2812,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4632 2007/03/06 10:21:18 djm Exp $
+$Id: ChangeLog,v 1.4633 2007/03/06 10:21:37 djm Exp $
diff --git a/version.h b/version.h
index d16990a2..0f481112 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: version.h,v 1.48 2006/11/07 10:31:31 markus Exp $ */
+/* $OpenBSD: version.h,v 1.49 2007/03/06 10:13:14 djm Exp $ */
-#define SSH_VERSION "OpenSSH_4.5"
+#define SSH_VERSION "OpenSSH_4.6"
#define SSH_PORTABLE "p1"
#define SSH_RELEASE SSH_VERSION SSH_PORTABLE