From owner-cvs-src@FreeBSD.ORG  Thu May  8 11:01:46 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 A61BD106564A;
	Thu,  8 May 2008 11:01:46 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 79B1E8FC1D;
	Thu,  8 May 2008 11:01:46 +0000 (UTC) (envelope-from dfr@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 m48B1kWo041423;
	Thu, 8 May 2008 11:01:46 GMT (envelope-from dfr@repoman.freebsd.org)
Received: (from dfr@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m48B1k9k041422;
	Thu, 8 May 2008 11:01:46 GMT (envelope-from dfr)
Message-Id: <200805081101.m48B1k9k041422@repoman.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Thu, 8 May 2008 11:01:46 +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/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.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: Thu, 08 May 2008 11:01:46 -0000

dfr         2008-05-08 11:01:46 UTC

  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:
  Merge from the vendor branch and resolve conflicts.
  
  Revision  Changes    Path
  1.4       +4 -5      src/contrib/com_err/com_err.c
  1.4       +8 -7      src/contrib/com_err/com_err.h
  1.4       +4 -4      src/contrib/com_err/com_right.h
  1.4       +9 -10     src/contrib/com_err/compile_et.c
  1.4       +3 -2      src/contrib/com_err/compile_et.h
  1.4       +4 -2      src/contrib/com_err/lex.l
  1.4       +22 -16    src/contrib/com_err/parse.y