From owner-cvs-src@FreeBSD.ORG  Mon Apr 21 18:31:50 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC80E106564A;
	Mon, 21 Apr 2008 18:31:50 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9AB1B8FC13;
	Mon, 21 Apr 2008 18:31:50 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3LIVo0W032168;
	Mon, 21 Apr 2008 18:31:50 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3LIVoD3032167;
	Mon, 21 Apr 2008 18:31:50 GMT (envelope-from delphij)
Message-Id: <200804211831.m3LIVoD3032167@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 21 Apr 2008 18:31:50 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/contrib/netcat nc.1
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Apr 2008 18:31:50 -0000

delphij     2008-04-21 18:31:50 UTC

  FreeBSD src repository

  Modified files:
    contrib/netcat       nc.1 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.9       +2 -2      src/contrib/netcat/nc.1