From owner-cvs-src@FreeBSD.ORG  Sun May 21 15:53:04 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 06DFD16A43E;
	Sun, 21 May 2006 15:53:04 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B9A6243D6D;
	Sun, 21 May 2006 15:53:02 +0000 (GMT)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4LFqOsQ005927;
	Sun, 21 May 2006 15:52:24 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4LFqOEW005926;
	Sun, 21 May 2006 15:52:24 GMT (envelope-from delphij)
Message-Id: <200605211552.k4LFqOEW005926@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 21 May 2006 15:52:24 +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 netcat.c
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: Sun, 21 May 2006 15:53:11 -0000

delphij     2006-05-21 15:52:24 UTC

  FreeBSD src repository

  Modified files:
    contrib/netcat       nc.1 netcat.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.6       +57 -30    src/contrib/netcat/nc.1
  1.4       +99 -54    src/contrib/netcat/netcat.c