Guido van Rooij dac098f2c9 Resolve conflicts ... MFC after: 1 weeks		2006-08-16 12:23:02 +00:00
..
amd	Correct a typo: In order to make fixmount(8) quite, one should	2006-04-18 03:33:17 +00:00
bc
bind9
binutils	This commit was generated by cvs2svn to compensate for changes in r159399,	2006-06-08 13:10:51 +00:00
bsnmp	This commit was generated by cvs2svn to compensate for changes in r159063,	2006-05-30 07:46:52 +00:00
bzip2
com_err
cpio
csup
cvs
diff
expat
file	This commit was generated by cvs2svn to compensate for changes in r159825,	2006-06-21 09:28:00 +00:00
gcc
gdb
gdtoa
gnu-sort
gperf
groff
hostapd	This commit was generated by cvs2svn to compensate for changes in r157181,	2006-03-27 18:15:24 +00:00
ipfilter	Resolve conflicts	2006-08-16 12:23:02 +00:00
less
libbegemot
libf2c
libobjc
libpcap
libreadline	Merge conflicts after official patches	2006-03-27 23:53:05 +00:00
libstdc++
lukemftp
lukemftpd
ncurses
netcat	Resolve conflicts.	2006-05-21 15:52:24 +00:00
ngatm
ntp
nvi
one-true-awk
openbsm	Resolve conflicts from OpenBSM 1.0 alpha 7 import.	2006-06-27 18:09:54 +00:00
openpam
opie	Add missing code needed for the detection of IPSec packet replays. [1]	2006-03-22 16:00:42 +00:00
pam_modules/pam_passwdqc
pf	- Note that the synchronisation interface needs to be up and have	2006-06-06 12:35:53 +00:00
pnpinfo
sendmail	Update FreeBSD info regarding sendmail 8.13.7 import	2006-06-14 16:33:59 +00:00
smbfs	Spell 'connection options' correctly.	2006-08-11 12:35:22 +00:00
tar
tcp_wrappers
tcpdump	Document that 'bad cksum 0' is expected on NICs with checksum off-loading.	2006-06-20 05:04:05 +00:00
tcsh
telnet
texinfo	Add note concerning FreeBSD-SA-06:01.texindex.	2006-07-08 07:32:41 +00:00
top	Update the description of the `STATE' column for SMP systems,	2006-05-16 15:27:43 +00:00
traceroute	Make traceroute decode all the ICMP unreachable messages defined	2006-06-13 14:59:07 +00:00
wpa_supplicant