diff options
author | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
commit | 88c7c9558ba88abbcc00dcd9133b4996eff74033 (patch) | |
tree | 15c858fecc18a67f9dcc639fd5be6afa6ed7037f /crypto/openssh/version.h | |
parent | 1ea3628aba1278f27d571a26380b4e91155d3973 (diff) | |
download | FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.zip FreeBSD-src-88c7c9558ba88abbcc00dcd9133b4996eff74033.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 778aa1c..bcfb720 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -1,12 +1,12 @@ -/* $OpenBSD: version.h,v 1.44 2005/03/16 21:17:39 markus Exp $ */ +/* $OpenBSD: version.h,v 1.45 2005/08/31 09:28:42 markus Exp $ */ /* $FreeBSD$ */ #ifndef SSH_VERSION #define SSH_VERSION (ssh_version_get()) #define SSH_RELEASE (ssh_version_get()) -#define SSH_VERSION_BASE "OpenSSH_4.1p1" -#define SSH_VERSION_ADDENDUM "FreeBSD-20050605" +#define SSH_VERSION_BASE "OpenSSH_4.2p1" +#define SSH_VERSION_ADDENDUM "FreeBSD-20050903" const char *ssh_version_get(void); void ssh_version_set_addendum(const char *add); |