From owner-cvs-all  Sat Jun  3  2:58:20 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0996C37B5B6; Sat,  3 Jun 2000 02:58:18 -0700 (PDT)
	(envelope-from kris@FreeBSD.org)
Received: (from kris@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id CAA78572;
	Sat, 3 Jun 2000 02:58:17 -0700 (PDT)
	(envelope-from kris@FreeBSD.org)
Message-Id: <200006030958.CAA78572@freefall.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Sat, 3 Jun 2000 02:58:17 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/openssh auth.c cipher.c servconf.c
         sshconnect.c sshd.c
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

kris        2000/06/03 02:58:17 PDT

  Modified files:
    crypto/openssh       auth.c cipher.c servconf.c sshconnect.c 
                         sshd.c 
  Log:
  Resolve conflicts
  
  Revision  Changes    Path
  1.3       +10 -3     src/crypto/openssh/auth.c
  1.5       +5 -3      src/crypto/openssh/cipher.c
  1.7       +6 -2      src/crypto/openssh/servconf.c
  1.7       +3 -18     src/crypto/openssh/sshconnect.c
  1.10      +14 -59    src/crypto/openssh/sshd.c



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message