diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2006-11-10 16:52:41 +0000 |
| commit | 62efe23a828ce21ae4d100dc0fd5331f5582e7df (patch) | |
| tree | 538ffcf6acb6ece62b0734e0707ef5a1e8efbd7a /crypto/openssh/version.h | |
| parent | b8e61582feacfd6acace15f1990fc0a5426d184e (diff) | |
| download | src-62efe23a828ce21ae4d100dc0fd5331f5582e7df.tar.gz src-62efe23a828ce21ae4d100dc0fd5331f5582e7df.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=164149
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 628f93f99a7e..3976bd1a8773 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -1,12 +1,12 @@ -/* $OpenBSD: version.h,v 1.47 2006/08/30 00:14:37 djm Exp $ */ +/* $OpenBSD: version.h,v 1.48 2006/11/07 10:31:31 markus Exp $ */ /* $FreeBSD$ */ #ifndef SSH_VERSION #define SSH_VERSION (ssh_version_get()) #define SSH_RELEASE (ssh_version_get()) -#define SSH_VERSION_BASE "OpenSSH_4.4p1" -#define SSH_VERSION_ADDENDUM "FreeBSD-20060930" +#define SSH_VERSION_BASE "OpenSSH_4.5p1" +#define SSH_VERSION_ADDENDUM "FreeBSD-20061110" const char *ssh_version_get(void); void ssh_version_set_addendum(const char *add); |