CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit

projects / FreeBSD / FreeBSD.git / commit

author	sam <sam@FreeBSD.org>
	Sun, 29 May 2005 19:09:28 +0000 (19:09 +0000)
committer	sam <sam@FreeBSD.org>
	Sun, 29 May 2005 19:09:28 +0000 (19:09 +0000)
commit	7dacff5dd0aeebda55a754dc5d25feab441b5d03
tree	71f0f8d5860cc5ba4d96abee0d8048a044b51cd3	tree \| snapshot
parent	d9db21b8bcec89e09ac680f84c6d7d0ca014d6df	commit \| diff

resolve merge conflicts and update for proper build; including:

o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h

Reviewed by: bms

31 files changed:

contrib/tcpdump/addrtoname.c		diff \| blob \| history
contrib/tcpdump/ethertype.h		diff \| blob \| history
contrib/tcpdump/interface.h		diff \| blob \| history
contrib/tcpdump/parsenfsfh.c		diff \| blob \| history
contrib/tcpdump/ppp.h		diff \| blob \| history
contrib/tcpdump/print-arp.c		diff \| blob \| history
contrib/tcpdump/print-atalk.c		diff \| blob \| history
contrib/tcpdump/print-atm.c		diff \| blob \| history
contrib/tcpdump/print-bootp.c		diff \| blob \| history
contrib/tcpdump/print-domain.c		diff \| blob \| history
contrib/tcpdump/print-ether.c		diff \| blob \| history
contrib/tcpdump/print-fddi.c		diff \| blob \| history
contrib/tcpdump/print-fr.c		diff \| blob \| history
contrib/tcpdump/print-icmp.c		diff \| blob \| history
contrib/tcpdump/print-ip.c		diff \| blob \| history
contrib/tcpdump/print-ip6.c		diff \| blob \| history
contrib/tcpdump/print-ipx.c		diff \| blob \| history
contrib/tcpdump/print-isoclns.c		diff \| blob \| history
contrib/tcpdump/print-llc.c		diff \| blob \| history
contrib/tcpdump/print-nfs.c		diff \| blob \| history
contrib/tcpdump/print-ntp.c		diff \| blob \| history
contrib/tcpdump/print-null.c		diff \| blob \| history
contrib/tcpdump/print-pim.c		diff \| blob \| history
contrib/tcpdump/print-ppp.c		diff \| blob \| history
contrib/tcpdump/print-sl.c		diff \| blob \| history
contrib/tcpdump/print-sunrpc.c		diff \| blob \| history
contrib/tcpdump/print-token.c		diff \| blob \| history
contrib/tcpdump/print-udp.c		diff \| blob \| history
contrib/tcpdump/tcpdump-stdinc.h		diff \| blob \| history
contrib/tcpdump/tcpdump.1		diff \| blob \| history
contrib/tcpdump/tcpdump.c		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom