diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
commit | c6a2c0334e45419875687d250aed9bea78480f2e (patch) | |
tree | d8f01bef9f3921fa1ca7592a19474be9c8349f76 /version.h | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) | |
parent | 8b13b5bdc4f19bd52ee673104d66b71c21153b96 (diff) |
merge 6.1p1
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ | |||
1 | /* $OpenBSD: version.h,v 1.64 2012/02/09 20:00:18 markus Exp $ */ | 1 | /* $OpenBSD: version.h,v 1.65 2012/07/22 18:19:21 markus Exp $ */ |
2 | 2 | ||
3 | #define SSH_VERSION "OpenSSH_6.0" | 3 | #define SSH_VERSION "OpenSSH_6.1" |
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 |