Xin LI 2440a45859 Resolve conflicts.		2006-05-21 15:52:24 +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	Reimplementation of world/kernel build options. For details, see:	2006-03-17 18:54:44 +00:00
binutils
bsnmp	Don't import tree.h from the distribution - we have our own one in sys.	2006-03-13 09:30:26 +00:00
bzip2
com_err
cpio
csup	Import the latest snapshot of csup (20060313).	2006-03-14 03:51:13 +00:00
cvs
diff
expat
file
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	fix "ipf -Z" reporting rubbish and possibly panic'ing box	2006-04-18 13:24:14 +00:00
less
libbegemot	This is actually a section 3 man page, not section 1. Also fix a couple	2006-03-17 10:04:10 +00:00
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	This commit was generated by cvs2svn to compensate for changes in r156678,	2006-03-13 09:37:22 +00:00
ntp
nvi
one-true-awk
openbsm	Take contrib/openbsm/etc configuration files off the vendor branch in	2006-03-26 01:44:35 +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	Document authpf's requirement for a mounted fdescfs(5).	2006-03-28 15:26:16 +00:00
pnpinfo
sendmail	Add a note regarding bumping the freebsd*mc files for mergemaster's sake.	2006-04-13 04:12:38 +00:00
smbfs
tar
tcp_wrappers
tcpdump
tcsh	Remove the nls/*/charset files to the exclude list. These files	2006-03-16 04:01:27 +00:00
telnet
texinfo
top	Update the description of the `STATE' column for SMP systems,	2006-05-16 15:27:43 +00:00
traceroute	Option for setting a fixed destination port. This is useful for tracing	2006-05-11 06:30:18 +00:00
wpa_supplicant