From owner-cvs-all  Fri Jul 19  9:38:26 2002
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 52F9837B400; Fri, 19 Jul 2002 09:38:22 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 03C9A43E6A; Fri, 19 Jul 2002 09:38:22 -0700 (PDT)
	(envelope-from markm@FreeBSD.org)
Received: from freefall.freebsd.org (markm@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6JGcLJU092644;
	Fri, 19 Jul 2002 09:38:21 -0700 (PDT)
	(envelope-from markm@freefall.freebsd.org)
Received: (from markm@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6JGcLxB092643;
	Fri, 19 Jul 2002 09:38:21 -0700 (PDT)
Message-Id: <200207191638.g6JGcLxB092643@freefall.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Fri, 19 Jul 2002 09:38:21 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/usr.bin/xlint/lint1 err.c mem1.c
         src/usr.bin/xlint/xlint lint.1 xlint.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

markm       2002/07/19 09:38:21 PDT

  Modified files:
    usr.bin/xlint/lint1  err.c mem1.c 
    usr.bin/xlint/xlint  lint.1 xlint.c 
  Log:
  Merge conflicts.
  
  Revision  Changes    Path
  1.9       +13 -13    src/usr.bin/xlint/lint1/err.c
  1.9       +9 -2      src/usr.bin/xlint/lint1/mem1.c
  1.25      +9 -9      src/usr.bin/xlint/xlint/lint.1
  1.21      +19 -18    src/usr.bin/xlint/xlint/xlint.c

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