From owner-cvs-src@FreeBSD.ORG  Sun Oct  5 18:55:18 2003
Return-Path: <owner-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 8BB7E16A4BF; Sun,  5 Oct 2003 18:55:18 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1003243FFB; Sun,  5 Oct 2003 18:55:18 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h961tHXJ069543;
	Sun, 5 Oct 2003 18:55:17 -0700 (PDT)
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h961tHxE069542;
	Sun, 5 Oct 2003 18:55:17 -0700 (PDT)
	(envelope-from dougb)
Message-Id: <200310060155.h961tHxE069542@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 5 Oct 2003 18:55:17 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/usr.bin/stat stat.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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, 06 Oct 2003 01:55:18 -0000

dougb       2003/10/05 18:55:17 PDT

  FreeBSD src repository

  Modified files:
    usr.bin/stat         stat.c 
  Log:
  Resolve conflicts
  
  Revision  Changes    Path
  1.6       +65 -5     src/usr.bin/stat/stat.c