[Midnightbsd-cvs] src: crypto/openssh: Resolve merge conflicts.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Feb 4 09:23:50 EST 2011
Log Message:
-----------
Resolve merge conflicts.
Modified Files:
--------------
src/crypto/openssh:
README (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/README?r1=1.8&r2=1.9)
auth-krb5.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth-krb5.c?r1=1.5&r2=1.6)
auth.c (r1.7 -> r1.8)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/auth.c?r1=1.7&r2=1.8)
authfile.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/authfile.c?r1=1.5&r2=1.6)
canohost.c (r1.7 -> r1.8)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/canohost.c?r1=1.7&r2=1.8)
channels.c (r1.9 -> r1.10)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/channels.c?r1=1.9&r2=1.10)
cipher-ctr.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/cipher-ctr.c?r1=1.5&r2=1.6)
kex.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/kex.c?r1=1.8&r2=1.9)
kex.h (r1.6 -> r1.7)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/kex.h?r1=1.6&r2=1.7)
kexdhc.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/kexdhc.c?r1=1.5&r2=1.6)
kexgexc.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/kexgexc.c?r1=1.5&r2=1.6)
misc.c (r1.7 -> r1.8)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/misc.c?r1=1.7&r2=1.8)
misc.h (r1.6 -> r1.7)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/misc.h?r1=1.6&r2=1.7)
monitor.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/monitor.c?r1=1.8&r2=1.9)
myproposal.h (r1.7 -> r1.8)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/myproposal.h?r1=1.7&r2=1.8)
packet.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/packet.c?r1=1.8&r2=1.9)
pathnames.h (r1.6 -> r1.7)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/pathnames.h?r1=1.6&r2=1.7)
readconf.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/readconf.c?r1=1.8&r2=1.9)
servconf.c (r1.10 -> r1.11)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/servconf.c?r1=1.10&r2=1.11)
session.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/session.c?r1=1.8&r2=1.9)
sftp-server.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sftp-server.c?r1=1.8&r2=1.9)
sftp.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sftp.c?r1=1.8&r2=1.9)
ssh-add.c (r1.5 -> r1.6)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-add.c?r1=1.5&r2=1.6)
ssh-agent.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-agent.c?r1=1.8&r2=1.9)
ssh-keygen.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-keygen.c?r1=1.8&r2=1.9)
ssh.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh.c?r1=1.8&r2=1.9)
sshconnect.c (r1.8 -> r1.9)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sshconnect.c?r1=1.8&r2=1.9)
sshd.c (r1.12 -> r1.13)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/sshd.c?r1=1.12&r2=1.13)
version.h (r1.15 -> r1.16)
(http://cvsweb.midnightbsd.org/src/crypto/openssh/version.h?r1=1.15&r2=1.16)
More information about the Midnightbsd-cvs
mailing list