From owner-cvs-all@FreeBSD.ORG  Wed Apr 23 10:13:14 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7096037B404; Wed, 23 Apr 2003 10:13:14 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D5D1343F75; Wed, 23 Apr 2003 10:13:13 -0700 (PDT)
	(envelope-from des@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3NHDD0U091404;
	Wed, 23 Apr 2003 10:13:13 -0700 (PDT)
	(envelope-from des@repoman.freebsd.org)
Received: (from des@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3NHDDn8091403;
	Wed, 23 Apr 2003 10:13:13 -0700 (PDT)
Message-Id: <200304231713.h3NHDDn8091403@repoman.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 23 Apr 2003 10:13:13 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/crypto/openssh acconfig.h configure.ac
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2003 17:13:15 -0000

des         2003/04/23 10:13:13 PDT

  FreeBSD src repository

  Modified files:
    crypto/openssh       acconfig.h configure.ac 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.6       +15 -2     src/crypto/openssh/acconfig.h
  1.6       +88 -35    src/crypto/openssh/configure.ac