summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--version.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e295ca5c..6490359bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,10 @@
37 - stevesk@cvs.openbsd.org 2010/03/16 15:46:52 37 - stevesk@cvs.openbsd.org 2010/03/16 15:46:52
38 [auth-options.c] 38 [auth-options.c]
39 spelling in error message. ok djm kettenis 39 spelling in error message. ok djm kettenis
40 - djm@cvs.openbsd.org 2010/03/16 16:36:49
41 [version.h]
42 crank version to openssh-5.5 since we have a few fixes since 5.4;
43 requested deraadt@ kettenis@
40 44
4120100314 4520100314
42 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix 46 - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
diff --git a/version.h b/version.h
index c604c753c..5d2b0b741 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.57 2010/03/07 22:01:32 djm Exp $ */ 1/* $OpenBSD: version.h,v 1.58 2010/03/16 16:36:49 djm Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_5.4" 3#define SSH_VERSION "OpenSSH_5.5"
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