[Midnightbsd-cvs] src: crypto/openssh: Resolve conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
Resolve conflicts

Modified Files:
--------------
    src/crypto/openssh/openbsd-compat:
        port-linux.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/port-linux.c?r1=1.3&r2=1.4)
        port-linux.h (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/port-linux.h?r1=1.3&r2=1.4)
    src/crypto/openssh:
        version.h (r1.18 -> r1.19)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/version.h?r1=1.18&r2=1.19)
        ssh.c (r1.10 -> r1.11)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh.c?r1=1.10&r2=1.11)
        entropy.c (r1.7 -> r1.8)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/entropy.c?r1=1.7&r2=1.8)
        README (r1.9 -> r1.10)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/README?r1=1.9&r2=1.10)