diff options
| author | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
| commit | 124c4a14153799ec55cc535db5222b1780208aa1 (patch) | |
| tree | 91bbaf12f7d9b9158ae725f996c95f18038af40c /crypto/openssh/version.h | |
| parent | 1754c77e5e8ce4ec5f746dc5ce34e4cb54e3130f (diff) | |
| download | FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.zip FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/version.h')
| -rw-r--r-- | crypto/openssh/version.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index 3f29aa3..5253723 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -1,11 +1,11 @@ -/* $OpenBSD: version.h,v 1.39 2003/09/16 21:02:40 markus Exp $ */ +/* $OpenBSD: version.h,v 1.40 2004/02/23 15:16:46 markus Exp $ */ /* $FreeBSD$ */ #ifndef SSH_VERSION #define SSH_VERSION (ssh_version_get()) -#define SSH_VERSION_BASE "OpenSSH_3.7.1p2" -#define SSH_VERSION_ADDENDUM "FreeBSD-20040106" +#define SSH_VERSION_BASE "OpenSSH_3.8p1" +#define SSH_VERSION_ADDENDUM "FreeBSD-20040226" const char *ssh_version_get(void); void ssh_version_set_addendum(const char *add); |
