cvs commit: src/crypto/openssh LICENCE acconfig.h auth-chall.c auth-krb5.c auth-pam.c auth-pam.h auth-passwd.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2-kbdint.c auth2.c authfile.c bufaux.c canohost.c channels.c channels.h cipher.c compat.c ...

[Pawel Worach]

Dag-Erling Smorgrav wrote:
> des         2005-06-05 15:46:09 UTC
> 
>   FreeBSD src repository
> 
>   Modified files:

>   Log:
>   Resolve conflicts.
>   
>   Revision  Changes    Path

>   1.29      +4 -3      src/crypto/openssh/version.h

Tiny nit.

--- crypto/openssh/version.h.orig	Sun Jun  5 18:52:46 2005
+++ crypto/openssh/version.h	Sun Jun  5 18:53:01 2005
@@ -6,7 +6,7 @@
  #define SSH_VERSION             (ssh_version_get())
  #define SSH_RELEASE             (ssh_version_get())
  #define SSH_VERSION_BASE        "OpenSSH_4.1p1"
-#define SSH_VERSION_ADDENDUM    "FreeBSD-20041028"
+#define SSH_VERSION_ADDENDUM    "FreeBSD-20050605"

  const char *ssh_version_get(void);
  void ssh_version_set_addendum(const char *add);

-- 
Pawel