From owner-cvs-all@FreeBSD.ORG  Tue Oct 16 02:07:56 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A2C716A503;
	Tue, 16 Oct 2007 02:07:56 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 342F213C455;
	Tue, 16 Oct 2007 02:07:56 +0000 (UTC)
	(envelope-from mlaier@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 l9G27uIg051775;
	Tue, 16 Oct 2007 02:07:56 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9G27u1x051774;
	Tue, 16 Oct 2007 02:07:56 GMT (envelope-from mlaier)
Message-Id: <200710160207.l9G27u1x051774@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Tue, 16 Oct 2007 02:07:56 +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/libpcap INSTALL gencode.c gencode.h
 grammar.y nametoaddr.c pcap-bpf.c pcap-int.h pcap.3 pcap.h pf.h
 scanner.l src/contrib/libpcap/lbl gnuc.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Oct 2007 02:07:56 -0000

mlaier      2007-10-16 02:07:56 UTC

  FreeBSD src repository

  Modified files:
    contrib/libpcap      gencode.c gencode.h grammar.y 
                         nametoaddr.c pcap-bpf.c pcap-int.h pcap.3 
                         pcap.h scanner.l 
  Removed files:
    contrib/libpcap      INSTALL pf.h 
    contrib/libpcap/lbl  gnuc.h 
  Log:
  Resolve merge conflicts
  
  Approved by:    re (kensmith)
  Obtained from:  tcpdump.org
  
  Revision  Changes    Path
  1.2       +0 -268    src/contrib/libpcap/INSTALL (dead)
  1.17      +800 -363  src/contrib/libpcap/gencode.c
  1.10      +13 -7     src/contrib/libpcap/gencode.h
  1.12      +64 -26    src/contrib/libpcap/grammar.y
  1.2       +0 -43     src/contrib/libpcap/lbl/gnuc.h (dead)
  1.13      +4 -4      src/contrib/libpcap/nametoaddr.c
  1.4       +12 -1     src/contrib/libpcap/pcap-bpf.c
  1.13      +30 -7     src/contrib/libpcap/pcap-int.h
  1.16      +14 -8     src/contrib/libpcap/pcap.3
  1.13      +17 -8     src/contrib/libpcap/pcap.h
  1.2       +0 -77     src/contrib/libpcap/pf.h (dead)
  1.14      +11 -7     src/contrib/libpcap/scanner.l