summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-08-23 22:56:08 +0100
committerColin Watson <cjwatson@debian.org>2010-08-23 22:56:08 +0100
commit31e30b835fd9695d3b6647cab4867001b092e28f (patch)
tree138e715c25661825457c7280cd66e3f4853d474c /version.h
parent78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff)
parent43094ebf14c9b16f1ea398bc5b65a7335e947288 (diff)
merge 5.6p1
Diffstat (limited to 'version.h')
-rw-r--r--version.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/version.h b/version.h
index 5d2b0b741..67d78dcc3 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.58 2010/03/16 16:36:49 djm Exp $ */ 1/* $OpenBSD: version.h,v 1.59 2010/08/08 16:26:42 djm Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_5.5" 3#define SSH_VERSION "OpenSSH_5.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