summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-04-16 10:04:09 +0100
committerColin Watson <cjwatson@debian.org>2010-04-16 10:04:09 +0100
commit78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (patch)
tree13e783343edf688afffb4a8e02dc9685342b98a6 /version.h
parentd1a87e462e1db89f19cd960588d0c6b287cb5ccc (diff)
parentff0095389ba9a9e4599e6051c8d5bae6777c4d64 (diff)
merge 5.5p1
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 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