From owner-cvs-all@FreeBSD.ORG  Mon Jul 11 03:43:26 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
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 2B29116A41C;
	Mon, 11 Jul 2005 03:43:26 +0000 (GMT) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E1D3743D49;
	Mon, 11 Jul 2005 03:43:25 +0000 (GMT) (envelope-from sam@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B3hPFc060358;
	Mon, 11 Jul 2005 03:43:25 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B3hPRq060357;
	Mon, 11 Jul 2005 03:43:25 GMT (envelope-from sam)
Message-Id: <200507110343.j6B3hPRq060357@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 11 Jul 2005 03:43:25 +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 gencode.c gencode.h grammar.y
 nametoaddr.c pcap-int.h pcap-namedb.h pcap.3 pcap.h rawss7.h
 scanner.l
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: Mon, 11 Jul 2005 03:43:26 -0000

sam         2005-07-11 03:43:25 UTC

  FreeBSD src repository

  Modified files:
    contrib/libpcap      gencode.c gencode.h grammar.y 
                         nametoaddr.c pcap-int.h pcap-namedb.h 
                         pcap.3 pcap.h scanner.l 
  Removed files:
    contrib/libpcap      rawss7.h 
  Log:
  resolve merge conflicts
  
  Approved by:    re (scottl)
  
  Revision  Changes     Path
  1.15      +1430 -474  src/contrib/libpcap/gencode.c
  1.8       +19 -6      src/contrib/libpcap/gencode.h
  1.10      +37 -5      src/contrib/libpcap/grammar.y
  1.12      +52 -2      src/contrib/libpcap/nametoaddr.c
  1.11      +18 -8      src/contrib/libpcap/pcap-int.h
  1.6       +1 -0       src/contrib/libpcap/pcap-namedb.h
  1.14      +42 -2      src/contrib/libpcap/pcap.3
  1.11      +9 -1       src/contrib/libpcap/pcap.h
  1.2       +0 -105     src/contrib/libpcap/rawss7.h (dead)
  1.12      +8 -1       src/contrib/libpcap/scanner.l