diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-06-29 11:48:59 +0000 |
| commit | a82e551f0fd24a72fde2fc9145eef2c270cda9c0 (patch) | |
| tree | 038040484c6082020b918a9c208a38e77fd09e7d /crypto/openssh/version.h | |
| parent | d2a34caedbbbc4693ecb276afb41ffe6c4e05c76 (diff) | |
| download | src-a82e551f0fd24a72fde2fc9145eef2c270cda9c0.tar.gz src-a82e551f0fd24a72fde2fc9145eef2c270cda9c0.zip | |
Resolve conflicts.
Sponsored by: DARPA, NAI Labs
Notes
Notes:
svn path=/head/; revision=99063
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 2d7291b5a96d..e9f3524da374 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -1,11 +1,11 @@ -/* $OpenBSD: version.h,v 1.33 2002/06/21 15:41:20 markus Exp $ */ +/* $OpenBSD: version.h,v 1.34 2002/06/26 13:56:27 markus Exp $ */ /* $FreeBSD$ */ #ifndef SSH_VERSION #define SSH_VERSION (ssh_version_get()) -#define SSH_VERSION_BASE "OpenSSH_3.3" -#define SSH_VERSION_ADDENDUM "FreeBSD-20020625" +#define SSH_VERSION_BASE "OpenSSH_3.4p1" +#define SSH_VERSION_ADDENDUM "FreeBSD-20020629" const char *ssh_version_get(void); void ssh_version_set_addendum(const char *add); |