summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-03-31 00:48:57 +0100
committerColin Watson <cjwatson@debian.org>2010-03-31 00:48:57 +0100
commitd1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch)
treef0d13e1687800f36a3c4322b94ac5230ad17bdbf /version.h
parent964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff)
parent004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff)
merge 5.4p1
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 721ebdea0..c604c753c 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
1/* $OpenBSD: version.h,v 1.56 2009/06/30 14:54:40 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.57 2010/03/07 22:01:32 djm Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_5.3" 3#define SSH_VERSION "OpenSSH_5.4"
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