From owner-cvs-src@FreeBSD.ORG  Sun May 29 18:09:05 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: 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 6285C16A41C;
	Sun, 29 May 2005 18:09:05 +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 409B043D1F;
	Sun, 29 May 2005 18:09:05 +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 j4TI95ag021240;
	Sun, 29 May 2005 18:09:05 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4TI95F1021239;
	Sun, 29 May 2005 18:09:05 GMT (envelope-from sam)
Message-Id: <200505291809.j4TI95F1021239@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 29 May 2005 18:09:05 +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 scanner.l
 snprintf.c
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: Sun, 29 May 2005 18:09:05 -0000

sam         2005-05-29 18:09:04 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      snprintf.c 
  Log:
  resolve merge conflicts
  
  Reviewed by:    bms (earlier version)
  
  Revision  Changes    Path
  1.14      +404 -222  src/contrib/libpcap/gencode.c
  1.7       +2 -1      src/contrib/libpcap/gencode.h
  1.9       +4 -4      src/contrib/libpcap/grammar.y
  1.11      +35 -13    src/contrib/libpcap/nametoaddr.c
  1.10      +26 -10    src/contrib/libpcap/pcap-int.h
  1.5       +5 -4      src/contrib/libpcap/pcap-namedb.h
  1.13      +69 -3     src/contrib/libpcap/pcap.3
  1.10      +54 -6     src/contrib/libpcap/pcap.h
  1.11      +2 -1      src/contrib/libpcap/scanner.l
  1.2       +0 -632    src/contrib/libpcap/snprintf.c (dead)