From owner-cvs-all@FreeBSD.ORG  Mon Jul 11 04:14:03 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 BF57A16A41C;
	Mon, 11 Jul 2005 04:14:03 +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 67AA043D46;
	Mon, 11 Jul 2005 04:14:03 +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 j6B4E3Ln061841;
	Mon, 11 Jul 2005 04:14:03 GMT (envelope-from sam@repoman.freebsd.org)
Received: (from sam@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B4E3JK061840;
	Mon, 11 Jul 2005 04:14:03 GMT (envelope-from sam)
Message-Id: <200507110414.j6B4E3JK061840@repoman.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 11 Jul 2005 04:14:02 +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/tcpdump addrtoname.c interface.h
 print-atm.c print-bootp.c print-domain.c print-ether.c print-fr.c
 print-icmp.c print-ip.c print-ip6.c print-ipx.c print-isoclns.c
 print-llc.c print-nfs.c print-ntp.c print-null.c print-pim.c ...
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 04:14:03 -0000

sam         2005-07-11 04:14:02 UTC

  FreeBSD src repository

  Modified files:
    contrib/tcpdump      addrtoname.c interface.h print-atm.c 
                         print-bootp.c print-domain.c 
                         print-ether.c print-fr.c print-icmp.c 
                         print-ip.c print-ip6.c print-ipx.c 
                         print-isoclns.c print-llc.c print-nfs.c 
                         print-ntp.c print-null.c print-pim.c 
                         print-ppp.c print-sunrpc.c 
                         tcpdump-stdinc.h tcpdump.1 tcpdump.c 
  Log:
  resolve merge conflicts
  
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.14      +28 -13    src/contrib/tcpdump/addrtoname.c
  1.11      +17 -4     src/contrib/tcpdump/interface.h
  1.11      +5 -5      src/contrib/tcpdump/print-atm.c
  1.11      +15 -5     src/contrib/tcpdump/print-bootp.c
  1.12      +4 -3      src/contrib/tcpdump/print-domain.c
  1.16      +2 -18     src/contrib/tcpdump/print-ether.c
  1.6       +115 -83   src/contrib/tcpdump/print-fr.c
  1.11      +34 -12    src/contrib/tcpdump/print-icmp.c
  1.13      +5 -1      src/contrib/tcpdump/print-ip.c
  1.7       +14 -1     src/contrib/tcpdump/print-ip6.c
  1.9       +7 -3      src/contrib/tcpdump/print-ipx.c
  1.15      +258 -42   src/contrib/tcpdump/print-isoclns.c
  1.11      +171 -106  src/contrib/tcpdump/print-llc.c
  1.12      +6 -4      src/contrib/tcpdump/print-nfs.c
  1.11      +3 -2      src/contrib/tcpdump/print-ntp.c
  1.11      +31 -48    src/contrib/tcpdump/print-null.c
  1.8       +5 -6      src/contrib/tcpdump/print-pim.c
  1.16      +188 -105  src/contrib/tcpdump/print-ppp.c
  1.11      +14 -13    src/contrib/tcpdump/print-sunrpc.c
  1.3       +22 -1     src/contrib/tcpdump/tcpdump-stdinc.h
  1.15      +46 -15    src/contrib/tcpdump/tcpdump.1
  1.10      +23 -2     src/contrib/tcpdump/tcpdump.c