From owner-cvs-src@FreeBSD.ORG  Sat Apr  3 13:17:02 2004
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 3552A16A4CF; Sat,  3 Apr 2004 13:17:02 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2E78443D58; Sat,  3 Apr 2004 13:17:02 -0800 (PST)
	(envelope-from nectar@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i33LH2Ge071490;
	Sat, 3 Apr 2004 13:17:02 -0800 (PST)
	(envelope-from nectar@repoman.freebsd.org)
Received: (from nectar@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i33LH1LE071489;
	Sat, 3 Apr 2004 13:17:01 -0800 (PST)
	(envelope-from nectar)
Message-Id: <200404032117.i33LH1LE071489@repoman.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Sat, 3 Apr 2004 13:17:01 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/com_err com_err.c com_err.h com_right.h
 compile_et.c compile_et.h lex.l parse.y
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: Sat, 03 Apr 2004 21:17:02 -0000

nectar      2004/04/03 13:17:01 PST

  FreeBSD src repository

  Modified files:
    contrib/com_err      com_err.c com_err.h com_right.h 
                         compile_et.c compile_et.h lex.l parse.y 
  Log:
  Resolve conflicts after import of Heimdal 0.6.1 libcom_err.
  
  Revision  Changes    Path
  1.3       +29 -11    src/contrib/com_err/com_err.c
  1.3       +11 -14    src/contrib/com_err/com_err.h
  1.3       +5 -10     src/contrib/com_err/com_right.h
  1.3       +17 -18    src/contrib/com_err/compile_et.c
  1.3       +4 -8      src/contrib/com_err/compile_et.h
  1.3       +12 -12    src/contrib/com_err/lex.l
  1.3       +7 -11     src/contrib/com_err/parse.y